[yum-commits] plugins/keys

[James Antill]

 plugins/keys/keys.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

    Deal with newer gpgcadir location in yum.

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