From f37c5016572fecb16cc53d5e3fdd059944e36359 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 15 Aug 2011 08:14:02 -0500 Subject: Show 'None' in Signatures -Qip/-Si output if none found This is to be as consistent as possible across both types of display. Signed-off-by: Dan McGee --- src/pacman/package.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 33ccbd41..8c101851 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -136,12 +136,15 @@ void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) 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") : _("No")); + string_display(_("Signatures :"), + alpm_pkg_get_base64_sig(pkg) ? _("Yes") : _("None")); } if(from == PKG_FROM_FILE) { alpm_sigresult_t result; int err = alpm_pkg_check_pgp_signature(pkg, &result); - if(err) { + if(err && alpm_errno(config->handle) == ALPM_ERR_SIG_MISSING) { + string_display(_("Signatures :"), _("None")); + } else if(err) { string_display(_("Signatures :"), alpm_strerror(alpm_errno(config->handle))); } else { -- cgit v1.2.3-70-g09d2