gkeys: Set default verify-keyring, add verify-nick default

Fix verify-keyring typo in verify action. Add missed self.category setting in verify().
vrosnet · Aug 25, 2015 · 1a96292 · 1a96292
1 parent 54c1719
commit 1a96292
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
@@ -660,7 +660,7 @@ def verify(self, args, messages=None):
         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 @@ def verify(self, args, messages=None):
     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
@@ -82,7 +82,8 @@ def _add_gkey_defaults(self):
             'keyring': None,
             'type': 'clearsign',
         }
-        self.defaults['verify-keyring'] = ''
+        self.defaults['verify-keyring'] = 'gentoo'
+        self.defaults['verify-nick'] = 'gkeys'
         self.defaults['verify-seeds'] = {}