[pius-commit] pius pius,1.29,1.30

[Phil D. <ja...@us...>]

Update of /cvsroot/pgpius/pius
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8896

Modified Files:
	pius 
Log Message:
Don't lose keyids just because the UID string happens to be the same.

This fixes bug 3067127.

Signed-off-by: Phil Dibowitz <ph...@ip...>



Index: pius
===================================================================
RCS file: /cvsroot/pgpius/pius/pius,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pius	4 Mar 2010 14:43:59 -0000	1.29
+++ pius	15 Sep 2010 21:23:33 -0000	1.30
@@ -229,7 +229,7 @@
     debug(cmd)
     gpg = os.popen(cmd, 'r')
     pub_re = re.compile('^pub:')
-    key_map = {}
+    key_tuples = []
     for line in gpg.readlines():
       if not pub_re.search(line):
         continue
@@ -238,12 +238,12 @@
       uid = lineparts[4]
       # get the shirt version
       uid = uid[8:16]
-      debug('Got id %s' % uid)
-      key_map[name] = uid
+      debug('Got id %s for %s' % (uid, name))
+      key_tuples.append((name, uid))
     gpg.close()
 
     # sort the list
-    keyids = [ i[1] for i in sorted(key_map.items())]
+    keyids = [ i[1] for i in sorted(key_tuples) ]
     return keyids
 
   def check_fingerprint(self, key):