summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-02-20 06:02:38 +0100
committerDan McGee <dan@archlinux.org>2012-03-09 01:00:05 +0100
commitf34864cc9e4e755f2add7581419f4ec1c2525fe0 (patch)
treec88fcd3ea6910c5bbb7290bb4f58adfd9336a465 /src
parent4773c6b66ef618f4c6345a99d9c246045e9c723b (diff)
downloadpacman-f34864cc9e4e755f2add7581419f4ec1c2525fe0.tar.gz
pacman-f34864cc9e4e755f2add7581419f4ec1c2525fe0.tar.xz
Simplify package validation info output for sync packages
Unify the output for local and sync packages by only printing a list of possible validation types for sync packages. This also has the advantage of not printing the very long sha256 checksum which line wrapped on a standard width terminal. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/pacman/package.c44
1 files changed, 18 insertions, 26 deletions
diff --git a/src/pacman/package.c b/src/pacman/package.c
index 6e4901d1..6e091d58 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -109,25 +109,23 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
break;
}
- if(from == PKG_FROM_LOCALDB) {
- alpm_pkgvalidation_t v = alpm_pkg_get_validation(pkg);
- if(v) {
- if(v & ALPM_PKG_VALIDATION_NONE) {
- validation = alpm_list_add(validation, _("None"));
- } else {
- if(v & ALPM_PKG_VALIDATION_MD5SUM) {
- validation = alpm_list_add(validation, _("MD5 Sum"));
- }
- if(v & ALPM_PKG_VALIDATION_SHA256SUM) {
- validation = alpm_list_add(validation, _("SHA256 Sum"));
- }
- if(v & ALPM_PKG_VALIDATION_SIGNATURE) {
- validation = alpm_list_add(validation, _("Signature"));
- }
- }
+ alpm_pkgvalidation_t v = alpm_pkg_get_validation(pkg);
+ if(v) {
+ if(v & ALPM_PKG_VALIDATION_NONE) {
+ validation = alpm_list_add(validation, _("None"));
} else {
- validation = alpm_list_add(validation, _("Unknown"));
+ if(v & ALPM_PKG_VALIDATION_MD5SUM) {
+ validation = alpm_list_add(validation, _("MD5 Sum"));
+ }
+ if(v & ALPM_PKG_VALIDATION_SHA256SUM) {
+ validation = alpm_list_add(validation, _("SHA256 Sum"));
+ }
+ if(v & ALPM_PKG_VALIDATION_SIGNATURE) {
+ validation = alpm_list_add(validation, _("Signature"));
+ }
}
+ } else {
+ validation = alpm_list_add(validation, _("Unknown"));
}
if(extra || from == PKG_FROM_LOCALDB) {
@@ -176,12 +174,8 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"));
}
- if(from == PKG_FROM_SYNCDB) {
- string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg));
- string_display(_("SHA256 Sum :"), alpm_pkg_get_sha256sum(pkg));
- string_display(_("Signatures :"),
- alpm_pkg_get_base64_sig(pkg) ? _("Yes") : _("None"));
- }
+ list_display(_("Validated By :"), validation);
+
if(from == PKG_FROM_FILE) {
alpm_siglist_t siglist;
int err = alpm_pkg_check_pgp_signature(pkg, &siglist);
@@ -195,9 +189,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
}
alpm_siglist_cleanup(&siglist);
}
- if(from == PKG_FROM_LOCALDB) {
- list_display(_("Validated By :"), validation);
- }
+
string_display(_("Description :"), alpm_pkg_get_desc(pkg));
/* Print additional package info if info flag passed more than once */