diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2015-08-25 07:05:26 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-08-25 07:05:26 -0700 |
| commit | 54c1719b1701ce9f4b5853b029a2e9bc9412db8e (patch) | |
| tree | fd88a9a871a35211344993f8349e31992146c59b | |
| parent | gkeys: Add settable trust-model for the keyrings (diff) | |
| download | gentoo-keys-54c1719b1701ce9f4b5853b029a2e9bc9412db8e.tar.gz gentoo-keys-54c1719b1701ce9f4b5853b029a2e9bc9412db8e.tar.bz2 gentoo-keys-54c1719b1701ce9f4b5853b029a2e9bc9412db8e.zip | |
actionbase.py: Fix sanity check in _set_category
pyGPG changed, it now returns None for a key/subkey that it fails to find.
Add a cat check as well.
| -rw-r--r-- | gkeys/gkeys/actionbase.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gkeys/gkeys/actionbase.py b/gkeys/gkeys/actionbase.py index e8d5ba4..c53bfdb 100644 --- a/gkeys/gkeys/actionbase.py +++ b/gkeys/gkeys/actionbase.py @@ -80,7 +80,9 @@ class ActionBase(object): def _set_category(self, cat): keyring = self.config.get_key('keyring') - if "foo-bar'd" in keyring: + if not keyring: + raise + if not cat: raise self.category = cat catdir = os.path.join(keyring, cat) |