[Collab-qa-commits] r1311 - upload-history

[filippo at alioth.debian.org]

Author: filippo
Date: 2008-10-01 13:43:50 +0000 (Wed, 01 Oct 2008)
New Revision: 1311

Modified:
   upload-history/munge_ddc.py
Log:
add GNUPGHOME to env and fix some corner cases

Modified: upload-history/munge_ddc.py
===================================================================
--- upload-history/munge_ddc.py	2008-09-30 06:33:58 UTC (rev 1310)
+++ upload-history/munge_ddc.py	2008-10-01 13:43:50 UTC (rev 1311)
@@ -56,9 +56,11 @@
         raise ValueError, "no keyring found"
 
     p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stderr=subprocess.PIPE,
-            stdout=subprocess.PIPE, env={"LC_ALL": "C"} )
+            stdout=subprocess.PIPE, env={"LC_ALL": "C", "GNUPGHOME": os.curdir} )
 
     (out, err) = p.communicate("\n".join(msg))
+    if not out:
+        return ("N/A", "N/A")
    
     m = keyid_RE.search(out)
     if m:
@@ -68,9 +70,13 @@
             return (m.group(2), m.group(3))
         # ERRSIG  <long keyid>  <pubkey_algo> <hash_algo> <sig_class> <timestamp> <rc>
         elif m.group(1) == "ERR":
+            #sys.stderr.write(repr(out) + "\n") 
             return (m.group(2), "N/A")
     else:
-        raise ValueError, out
+        if out.startswith("[GNUPG:] NODATA 1"):
+            return ("N/A", "N/A")
+        else:
+            raise ValueError, repr(out) + repr(err)
         #return ("N/A", "N/A")
 
 get_key_info = get_key_info_gpgv