88 from pkg.misc import EmptyI, msg, PipeError |
88 from pkg.misc import EmptyI, msg, PipeError |
89 except KeyboardInterrupt: |
89 except KeyboardInterrupt: |
90 import sys |
90 import sys |
91 sys.exit(1) |
91 sys.exit(1) |
92 |
92 |
93 CLIENT_API_VERSION = 64 |
93 CLIENT_API_VERSION = 65 |
94 PKG_CLIENT_NAME = "pkg" |
94 PKG_CLIENT_NAME = "pkg" |
95 |
95 |
96 JUST_UNKNOWN = 0 |
96 JUST_UNKNOWN = 0 |
97 JUST_LEFT = -1 |
97 JUST_LEFT = -1 |
98 JUST_RIGHT = 1 |
98 JUST_RIGHT = 1 |
468 if ppub: |
468 if ppub: |
469 ppub = ppub.prefix |
469 ppub = ppub.prefix |
470 try: |
470 try: |
471 res = api_inst.get_pkg_list(pkg_list, patterns=pargs, |
471 res = api_inst.get_pkg_list(pkg_list, patterns=pargs, |
472 raise_unmatched=True, repos=origins, variants=variants) |
472 raise_unmatched=True, repos=origins, variants=variants) |
473 for pt, summ, cats, states in res: |
473 for pt, summ, cats, states, attrs in res: |
474 found = True |
474 found = True |
475 if not omit_headers: |
475 if not omit_headers: |
476 if verbose: |
476 if verbose: |
477 msg(fmt_str % |
477 msg(fmt_str % |
478 ("FMRI", "IFO")) |
478 ("FMRI", "IFO")) |
3015 for dep in pi.dependencies[1:]: |
3015 for dep in pi.dependencies[1:]: |
3016 msg(" " * len(name_str), dep) |
3016 msg(" " * len(name_str), dep) |
3017 |
3017 |
3018 # XXX even more info on the publisher would be nice? |
3018 # XXX even more info on the publisher would be nice? |
3019 msg(_(" Publisher:"), pi.publisher) |
3019 msg(_(" Publisher:"), pi.publisher) |
3020 msg(_(" Version:"), pi.version) |
3020 hum_ver = pi.get_attr_values("pkg.human-version") |
|
3021 if hum_ver and hum_ver[0] != pi.version: |
|
3022 msg(_(" Version:"), "%s (%s)" % |
|
3023 (pi.version, hum_ver[0])) |
|
3024 else: |
|
3025 msg(_(" Version:"), pi.version) |
3021 msg(_(" Build Release:"), pi.build_release) |
3026 msg(_(" Build Release:"), pi.build_release) |
3022 msg(_(" Branch:"), pi.branch) |
3027 msg(_(" Branch:"), pi.branch) |
3023 msg(_("Packaging Date:"), pi.packaging_date) |
3028 msg(_("Packaging Date:"), pi.packaging_date) |
3024 msg(_(" Size:"), misc.bytes_to_str(pi.size)) |
3029 msg(_(" Size:"), misc.bytes_to_str(pi.size)) |
3025 msg(_(" FMRI:"), pi.fmri) |
3030 msg(_(" FMRI:"), pi.fmri) |
3421 res = api_inst.get_pkg_list(pkg_list, patterns=pargs, |
3426 res = api_inst.get_pkg_list(pkg_list, patterns=pargs, |
3422 raise_unmatched=True, return_fmris=True, variants=True, |
3427 raise_unmatched=True, return_fmris=True, variants=True, |
3423 repos=origins) |
3428 repos=origins) |
3424 manifests = [] |
3429 manifests = [] |
3425 |
3430 |
3426 for pfmri, summ, cats, states in res: |
3431 for pfmri, summ, cats, states, pattrs in res: |
3427 manifests.append(api_inst.get_manifest(pfmri, |
3432 manifests.append(api_inst.get_manifest(pfmri, |
3428 all_variants=display_raw, repos=origins)) |
3433 all_variants=display_raw, repos=origins)) |
3429 except api_errors.ImageFormatUpdateNeeded, e: |
3434 except api_errors.ImageFormatUpdateNeeded, e: |
3430 format_update_error(e) |
3435 format_update_error(e) |
3431 return EXIT_OOPS |
3436 return EXIT_OOPS |