From 5c123b679fd0224812f4d33dbb8d660f3d81c30c Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 20 Mar 2013 15:07:16 +0000 Subject: [PATCH] [solo.utils] print_package_info: also print SHA1, SHA256 and GPG info --- client/solo/utils.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/client/solo/utils.py b/client/solo/utils.py index 100ecf2ac..04deb78ec 100644 --- a/client/solo/utils.py +++ b/client/solo/utils.py @@ -396,7 +396,7 @@ def print_package_info(package_id, entropy_client, entropy_repository, if not strict_output: toc.append((darkgreen(" %s:" % (_("Slot"),) ), - blue(str(pkgslot)),)) + blue(pkgslot),)) if extended: pkgsize = entropy_repository.retrieveSize(package_id) @@ -406,17 +406,30 @@ def print_package_info(package_id, entropy_client, entropy_repository, pkgbin = corrupted_str pkgdigest = entropy_repository.retrieveDigest(package_id) or \ corrupted_str + pkgsign = entropy_repository.retrieveSignatures(package_id) pkgdeps = entropy_repository.retrieveDependencies(package_id, extended = True, resolve_conditional_deps = False) pkgconflicts = entropy_repository.retrieveConflicts(package_id) depsorter = lambda x: entropy.dep.dep_getcpv(x[0]) toc.append((darkgreen(" %s:" % (_("Size"),) ), - blue(str(pkgsize)),)) + blue(pkgsize),)) toc.append((darkgreen(" %s:" % (_("Download"),) ), - brown(str(pkgbin)),)) + brown(pkgbin),)) toc.append((darkgreen(" %s:" % (_("Checksum"),) ), - brown(str(pkgdigest)),)) + brown(pkgdigest),)) + if pkgsign: + sha1, sha256, sha512, gpg = pkgsign + toc.append((darkgreen(" %s:" % (_("SHA1"),) ), + brown(sha1),)) + toc.append((darkgreen(" %s:" % (_("SHA256"),) ), + brown(sha256),)) + if gpg: + gpg_str = _("Yes") + else: + gpg_str = _("No") + toc.append((darkgreen(" %s:" % (_("GPG"),) ), + brown(gpg_str),)) if pkgdeps: toc.append(darkred(" ##") + " " + \