[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

[Brian Dolbec]

commit:     c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  5 15:25:13 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 05:22:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=c63848f5

gkeys actionbase.py: Update _set_category for the new keyrings config

All keyings locations can be set individually now

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 gkeys/gkeys/actionbase.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gkeys/gkeys/actionbase.py b/gkeys/gkeys/actionbase.py
index 23b7161..737c9d6 100644
--- a/gkeys/gkeys/actionbase.py
+++ b/gkeys/gkeys/actionbase.py
@@ -80,13 +80,12 @@ class ActionBase(object):
 
 
     def _set_category(self, cat):
-        keyring = self.config.get_key('keyring')
-        if not keyring:
+        catdir = self.config.get_key('keyrings', cat)
+        if not catdir:
             raise Exception("No keyring set.")
         if not cat:
             raise Exception("No category set.")
         self.category = cat
-        catdir = os.path.join(keyring, cat)
         self.logger.debug(_unicode("ACTIONS: _set_category; catdir = %s") % 
catdir)
         self._set_trust(cat)
         return catdir