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

[James Antill]

 yum/yumRepo.py |   17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit b3fc8bad22366d3a7a47297e38466ad4a85f1081
Author: James Antill <james at and.org>
Date:   Wed Nov 12 10:38:20 2008 -0500

    Allow re-adding deleted keys

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 4729ae3..01ff5ea 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -1326,18 +1326,11 @@ class YumRepository(Repository, config.RepoConf):
             except URLGrabError, e:
                 raise URLGrabError(-1, 'Error finding signature for repomd.xml for %s: %s' % (self, e))
 
-            if not os.path.exists(self.gpgdir):
-                if self.gpg_import_func:
-                    #FIXME probably should have an else off of this to
-                    # complain if there is no import function
-                    try:
-                        self.gpg_import_func(self, self.confirm_func)
-                    except Errors.YumBaseError, e:
-                        raise URLGrabError(-1, 'Gpg Keys not imported, cannot verify repomd.xml for repo %s' % (self))
-
-                    # FIXME if we get the okay here to import the key then
-                    # we should set an option so that future key imports for this
-                    # repo will be allowed w/o question
+            if self.gpg_import_func:
+                try:
+                    self.gpg_import_func(self, self.confirm_func)
+                except Errors.YumBaseError, e:
+                    raise URLGrabError(-1, 'Gpg Keys not imported, cannot verify repomd.xml for repo %s' % (self))
 
             if not misc.valid_detached_sig(result, filepath, self.gpgdir):
                 raise URLGrabError(-1, 'repomd.xml signature could not be verified for %s' % (self))