From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 23 Mar 2009 11:39:49 +0000 (+0100)
Subject: Print gpg's exit status when it fails
X-Git-Tag: userdir-ldap-0.3.63
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=f4ad0eef31778c9567e0bd1c4f7fc81395eef970

Print gpg's exit status when it fails
---

diff --git a/debian/changelog b/debian/changelog
index 73ec66c..348d770 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userdir-ldap (0.3.63) unstable; urgency=low
+
+  * Print gpg's exit status when it fails.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 23 Mar 2009 12:39:27 +0100
+
 userdir-ldap (0.3.62) unstable; urgency=low
 
   * ud-generate: do not die when building ssh_known_hosts
diff --git a/userdir_gpg.py b/userdir_gpg.py
index cf9cdbc..7707652 100644
--- a/userdir_gpg.py
+++ b/userdir_gpg.py
@@ -423,7 +423,7 @@ def GPGCheckSig(Message):
       # A gpg failure is an automatic bad signature
       if Exit[1] != 0 and Why == None:
          GoodSig = 0;
-         Why = "GPG execution failed " + str(Exit[0]);
+         Why = "GPG execution returned non-zero exit status: " + str(Exit[1]);
 
       if GoodSig == 0 and (Why == None or len(Why) == 0):
          Why = "Checking Failed";