[yum-cvs] yum/__init__.py yum/misc.py

[Seth Vidal]

 yum/__init__.py |    4 +++-
 yum/misc.py     |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 09640c743fb6a7ade5711183dc7d5964e1bd3221
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 10 11:09:57 2007 -0400

    apply patch from Robin Norwood to expose more information from the gpg keys we
    read in - timestamp and fingerprint

diff --git a/yum/__init__.py b/yum/__init__.py
index b5009c0..372e0ec 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2155,6 +2155,7 @@ class YumBase(depsolve.Depsolve):
                 hexkeyid = misc.keyIdToRPMVer(keyid).upper()
                 timestamp = keyinfo['timestamp']
                 userid = keyinfo['userid']
+                fingerprint = keyinfo['fingerprint']
             except ValueError, e:
                 raise Errors.YumBaseError, \
                       'GPG key parsing failed: ' + str(e)
@@ -2172,7 +2173,8 @@ class YumBase(depsolve.Depsolve):
                 rc = True
             elif fullaskcb:
                 rc = fullaskcb({"po": po, "userid": userid,
-                                "hexkeyid": hexkeyid, "keyurl": keyurl})
+                                "hexkeyid": hexkeyid, "keyurl": keyurl,
+                                "fingerprint": fingerprint, "timestamp": timestamp})
             elif askcb:
                 rc = askcb(po, userid, hexkeyid)
 
diff --git a/yum/misc.py b/yum/misc.py
index 4b78f4b..7c710e2 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -204,6 +204,7 @@ def getgpgkeyinfo(rawkey):
         'userid': key.user_id,
         'keyid': struct.unpack('>Q', keyid_blob)[0],
         'timestamp': key.public_key.timestamp,
+        'fingerprint' : key.public_key.fingerprint,
     }
 
     # Retrieve the timestamp from the matching signature packet