diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2015-08-25 07:09:09 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-08-25 07:09:09 -0700 |
| commit | 1a9629201a102f2a173116a9e9ce368315501c0e (patch) | |
| tree | f7f222c0aa250193e473cacaa04548759ef82897 | |
| parent | actionbase.py: Fix sanity check in _set_category (diff) | |
| download | gentoo-keys-1a9629201a102f2a173116a9e9ce368315501c0e.tar.gz gentoo-keys-1a9629201a102f2a173116a9e9ce368315501c0e.tar.bz2 gentoo-keys-1a9629201a102f2a173116a9e9ce368315501c0e.zip | |
gkeys: Set default verify-keyring, add verify-nick default
Fix verify-keyring typo in verify action.
Add missed self.category setting in verify().
| -rw-r--r-- | gkeys/gkeys/actions.py | 3 | ||||
| -rw-r--r-- | gkeys/gkeys/config.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py index 69d05b6..01255eb 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -660,7 +660,7 @@ class Actions(ActionBase): if not args.filename: return (False, ['Please provide a signed file.']) if not args.category: - args.category = self.config.get_key('verify_keyring') + args.category = self.config.get_key('verify-keyring') self.logger.debug(_unicode( "ACTIONS: verify; keyring category not specified, using default: %s") % args.category) @@ -685,6 +685,7 @@ class Actions(ActionBase): def _verify(self, args, key, messages=None): if messages == None: messages = [] + self.category = args.category filepath, signature = args.filename, args.signature timestamp_path = None isurl = success = verified = False diff --git a/gkeys/gkeys/config.py b/gkeys/gkeys/config.py index 592aad6..ee667ec 100644 --- a/gkeys/gkeys/config.py +++ b/gkeys/gkeys/config.py @@ -82,7 +82,8 @@ class GKeysConfig(GPGConfig): 'keyring': None, 'type': 'clearsign', } - self.defaults['verify-keyring'] = '' + self.defaults['verify-keyring'] = 'gentoo' + self.defaults['verify-nick'] = 'gkeys' self.defaults['verify-seeds'] = {} |