[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/__init__.py

[skvidal at osuosl.org]

 yum/__init__.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 887bc39594e96315a4486f6569f29f4ada181b89
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Oct 29 11:25:35 2009 -0400

    and make sure the url and exception are using the 'proper' ones.

diff --git a/yum/__init__.py b/yum/__init__.py
index 975bb01..b7eec25 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3732,7 +3732,7 @@ class YumBase(depsolve.Depsolve):
             keys_info = misc.getgpgkeyinfo(rawkey, multiple=True)
         except ValueError, e:
             raise Errors.YumBaseError(_('Invalid GPG Key from %s: %s') % 
-                                      (keyurl, str(e)))
+                                      (url, to_unicide(str(e))))
         keys = []
         for keyinfo in keys_info:
             thiskey = {}
commit 31e153d4086b135212ee1767d39224a606988e87
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Oct 29 11:23:50 2009 -0400

    fix for https://bugzilla.redhat.com/show_bug.cgi?id=531781
    
    when grabbing gpg keys - if they are not what they should be don't traceback
    throw up a yumbaserror like we would if they are not found.

diff --git a/yum/__init__.py b/yum/__init__.py
index 8b770cd..975bb01 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3728,7 +3728,11 @@ class YumBase(depsolve.Depsolve):
             raise Errors.YumBaseError(_('GPG key retrieval failed: ') +
                                       to_unicode(str(e)))
         # Parse the key
-        keys_info = misc.getgpgkeyinfo(rawkey, multiple=True)
+        try:
+            keys_info = misc.getgpgkeyinfo(rawkey, multiple=True)
+        except ValueError, e:
+            raise Errors.YumBaseError(_('Invalid GPG Key from %s: %s') % 
+                                      (keyurl, str(e)))
         keys = []
         for keyinfo in keys_info:
             thiskey = {}