pld-builder.new: PLD_Builder/gpg.py - handle aliases in GPG keys

[wiget]

Author: wiget                        Date: Wed Mar  1 16:52:33 2006 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- handle aliases in GPG keys

---- Files affected:
pld-builder.new/PLD_Builder:
   gpg.py (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/gpg.py
diff -u pld-builder.new/PLD_Builder/gpg.py:1.9 pld-builder.new/PLD_Builder/gpg.py:1.10
--- pld-builder.new/PLD_Builder/gpg.py:1.9	Thu Dec  9 19:09:04 2004
+++ pld-builder.new/PLD_Builder/gpg.py	Wed Mar  1 17:52:27 2006
@@ -16,12 +16,12 @@
     """
     (gpg_out, gpg_in, gpg_err) = popen2.popen3("gpg --batch --no-tty --decrypt")
     body = pipeutil.rw_pipe(buf, gpg_in, gpg_out)
-    rx = re.compile("^gpg: Good signature from .*<([^>]+)>")
+    rx = re.compile("^gpg: (Good signature from|                aka) .*<([^>]+)>")
     emails = []
     for l in gpg_err.xreadlines():
         m = rx.match(l)
         if m:
-            emails.append(m.group(1))
+            emails.append(m.group(2))
     gpg_err.close()
     return (emails, body)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/gpg.py?r1=1.9&r2=1.10&f=u