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

[Brian Dolbec]

commit:     c05d6a6e622d14a6dc9d3b72b34e7d040efe7a37
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 20:49:18 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat May 30 23:18:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=c05d6a6e

gkeys: Fix list-key action to list all keys found in the keydir unless -f is 
passed in

This now ignores the keys listed in the db's seed file and lists all keys seen 
by gpg.
Except when -f, --fingerprint is an argument, then it lists only that key.

 gkeys/gkeys/actions.py | 5 ++++-
 gkeys/gkeys/lib.py     | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 22d660f..6975c38 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -237,7 +237,10 @@ class Actions(object):
             kwargs = handler.build_gkeydict(args)
             keyresults = seeds.list(**kwargs)
             for key in sorted(keyresults):
-                result = self.gpg.list_keys(key.keydir, key.fingerprint)
+                if args.fingerprint:
+                    result = self.gpg.list_keys(key.keydir, 
kwargs['fingerprint'])
+                else:
+                    result = self.gpg.list_keys(key.keydir)
                 ls, lr = self._list_it(key, result.output)
                 success.append(ls)
                 results[key.name] = lr

diff --git a/gkeys/gkeys/lib.py b/gkeys/gkeys/lib.py
index a740dd9..bce4e55 100644
--- a/gkeys/gkeys/lib.py
+++ b/gkeys/gkeys/lib.py
@@ -254,16 +254,17 @@ class GkeysGPG(GPG):
         if fingerprint:
             task = 'list-key'
             target = fingerprint
+            self.set_keydir(keydir, task, fingerprint=True)
         else:
             task = 'list-keys'
-            target = keydir
-        self.set_keydir(keydir, task, fingerprint=True)
-        self.config.options['tasks'][task].extend(['--keyid-format', 'long', 
'--fingerprint', '--fingerprint'])
+            target = ''
+            self.set_keydir(keydir, task, fingerprint=False)
+        self.config.options['tasks'][task].extend(['--keyid-format', 'long', 
'--fingerprint'])
         if colons:
             task_value = ['--with-colons']
             self.config.options['tasks'][task].extend(task_value)
         self.logger.debug("** Calling runGPG with Running 'gpg %s --%s %s'"
-            % (' '.join(self.config['tasks'][task]), task, keydir)
+            % (' '.join(self.config['tasks'][task]), task, target)
             )
         result = self.runGPG(task=task, inputfile=target)
         self.logger.info('GPG return code: ' + str(result.returncode))