summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-15 15:14:02 +0200
committerDan McGee <dan@archlinux.org>2011-08-15 19:12:37 +0200
commitf37c5016572fecb16cc53d5e3fdd059944e36359 (patch)
tree737c6d224d68c519ff95c29ffa2c0d9016730bf5
parentfa4aad5b509946f947d9b2553d09f5f35be24915 (diff)
downloadpacman-f37c5016572fecb16cc53d5e3fdd059944e36359.tar.gz
pacman-f37c5016572fecb16cc53d5e3fdd059944e36359.tar.xz
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 <dan@archlinux.org>
-rw-r--r--src/pacman/package.c7
1 files 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 {