[yum-commits] plugins/keys

[James Antill]

 plugins/keys/keys.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit d5535168bd89ce59eaed6104f7db5cd3c7a20450
Author: James Antill <james at and.org>
Date:   Wed Apr 22 00:28:32 2015 -0400

    Deal with gpgdir and gpgcadir keys.

diff --git a/plugins/keys/keys.py b/plugins/keys/keys.py
index ffedcc3..d765ef7 100644
--- a/plugins/keys/keys.py
+++ b/plugins/keys/keys.py
@@ -150,10 +150,12 @@ class KeysListCommand:
         if gpgme is not None:
             base.repos.doSetup() # Without this repo.cachedir is empty *sigh*
             for repo in base.repos.listEnabled():
-                if hasattr(repo, 'gpgcadir'):
-                    gpgdir = repo.gpgcadir
-                else:
-                    gpgdir = '%s/gpgdir' % repo.cachedir
+              if hasattr(repo, 'gpgcadir'):
+                  gpgdirs = [repo.gpgcadir, repo.gpgdir]
+              else:
+                  gpgdirs = ['%s/gpgdir' % repo.cachedir]
+
+              for gpgdir in gpgdirs:
                 if not os.path.exists(gpgdir):
                     continue