| 1 |
commit: c05d6a6e622d14a6dc9d3b72b34e7d040efe7a37 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 18 20:49:18 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 30 23:18:50 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=c05d6a6e |
| 7 |
|
| 8 |
gkeys: Fix list-key action to list all keys found in the keydir unless -f is passed in |
| 9 |
|
| 10 |
This now ignores the keys listed in the db's seed file and lists all keys seen by gpg. |
| 11 |
Except when -f, --fingerprint is an argument, then it lists only that key. |
| 12 |
|
| 13 |
gkeys/gkeys/actions.py | 5 ++++- |
| 14 |
gkeys/gkeys/lib.py | 9 +++++---- |
| 15 |
2 files changed, 9 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py |
| 18 |
index 22d660f..6975c38 100644 |
| 19 |
--- a/gkeys/gkeys/actions.py |
| 20 |
+++ b/gkeys/gkeys/actions.py |
| 21 |
@@ -237,7 +237,10 @@ class Actions(object): |
| 22 |
kwargs = handler.build_gkeydict(args) |
| 23 |
keyresults = seeds.list(**kwargs) |
| 24 |
for key in sorted(keyresults): |
| 25 |
- result = self.gpg.list_keys(key.keydir, key.fingerprint) |
| 26 |
+ if args.fingerprint: |
| 27 |
+ result = self.gpg.list_keys(key.keydir, kwargs['fingerprint']) |
| 28 |
+ else: |
| 29 |
+ result = self.gpg.list_keys(key.keydir) |
| 30 |
ls, lr = self._list_it(key, result.output) |
| 31 |
success.append(ls) |
| 32 |
results[key.name] = lr |
| 33 |
|
| 34 |
diff --git a/gkeys/gkeys/lib.py b/gkeys/gkeys/lib.py |
| 35 |
index a740dd9..bce4e55 100644 |
| 36 |
--- a/gkeys/gkeys/lib.py |
| 37 |
+++ b/gkeys/gkeys/lib.py |
| 38 |
@@ -254,16 +254,17 @@ class GkeysGPG(GPG): |
| 39 |
if fingerprint: |
| 40 |
task = 'list-key' |
| 41 |
target = fingerprint |
| 42 |
+ self.set_keydir(keydir, task, fingerprint=True) |
| 43 |
else: |
| 44 |
task = 'list-keys' |
| 45 |
- target = keydir |
| 46 |
- self.set_keydir(keydir, task, fingerprint=True) |
| 47 |
- self.config.options['tasks'][task].extend(['--keyid-format', 'long', '--fingerprint', '--fingerprint']) |
| 48 |
+ target = '' |
| 49 |
+ self.set_keydir(keydir, task, fingerprint=False) |
| 50 |
+ self.config.options['tasks'][task].extend(['--keyid-format', 'long', '--fingerprint']) |
| 51 |
if colons: |
| 52 |
task_value = ['--with-colons'] |
| 53 |
self.config.options['tasks'][task].extend(task_value) |
| 54 |
self.logger.debug("** Calling runGPG with Running 'gpg %s --%s %s'" |
| 55 |
- % (' '.join(self.config['tasks'][task]), task, keydir) |
| 56 |
+ % (' '.join(self.config['tasks'][task]), task, target) |
| 57 |
) |
| 58 |
result = self.runGPG(task=task, inputfile=target) |
| 59 |
self.logger.info('GPG return code: ' + str(result.returncode)) |
Archives