diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2018-07-05 08:25:13 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2018-07-06 22:22:12 -0700 |
| commit | c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba (patch) | |
| tree | 0e54601c42b0f308f16096188f0e9668b3ef7c40 | |
| parent | gkeys actions.py: Add verify() recursion detection and exit (diff) | |
| download | gentoo-keys-c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba.tar.gz gentoo-keys-c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba.tar.bz2 gentoo-keys-c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba.zip | |
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@gentoo.org>
| -rw-r--r-- | gkeys/gkeys/actionbase.py | 5 |
1 files 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 |