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

["Brian Dolbec" <dolsen@gentoo.org>]

commit:     9f19528a9d61517cb262081b2cf28a3c2d5ee95b
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 17:48:15 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun May 31 04:45:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=9f19528a

gkeys/actions.py: Seed handling fixes

Update for newer listseed() data returned.

 gkeys/gkeys/actions.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 80c3c72..d467500 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -98,7 +98,8 @@ class Actions(object):
     def addseed(self, args):
         '''Add or replace a key in the selected seed file'''
         handler = SeedHandler(self.logger, self.config)
-        success, gkeys = self.listseed(args)[1]
+        success, data = self.listseed(args)
+        gkeys = data[1]
         if not args.nick or not args.name or not args.keys or not args.keydir:
             return (False, ["Provide a nickname, a name and a public key fingerprint (-K, --keys)."])
         if not args.fingerprint:
@@ -126,7 +127,8 @@ class Actions(object):
 
     def removeseed(self, args):
         '''Remove a seed from the selected seed file'''
-        success, gkeys = self.listseed(args)[1]
+        success, data = self.listseed(args)
+        gkeys = data[1]
         if not gkeys:
             return (False, ["Failed to remove seed: No gkeys returned from listseed()",
                 []])
@@ -249,7 +251,8 @@ class Actions(object):
     def installkey(self, args):
         '''Install a key from the seed(s)'''
         self.logger.debug("ACTIONS: installkey; args: %s" % str(args))
-        success, gkeys = self.listseed(args)[1]
+        success, data = self.listseed(args)
+        gkeys = data[1]
         if gkeys:
             if gkeys and not args.nick == '*' and self.output:
                 self.output(['', gkeys], "\n Found GKEY seeds:")
@@ -593,7 +596,8 @@ class Actions(object):
             self.logger.debug(_unicode("ACTIONS: importkey; catdir = %s")
                 % catdir)
             self.gpg = GkeysGPG(self.config, catdir, self.logger)
-            success, gkeys = self.listseed(args)[1]
+            success, data = self.listseed(args)
+            gkeys = data[1]
             results = {}
             failed = []
             print("Importing specified keys to keyring.")