| 1 |
commit: 33625064ee63796b6b02ca9f200d3d4ff1707ff9 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 5 15:31:20 2018 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 7 05:22:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=33625064 |
| 7 |
|
| 8 |
gkeys lib.py: Additional debug logging |
| 9 |
|
| 10 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 11 |
|
| 12 |
gkeys/gkeys/actions.py | 2 -- |
| 13 |
gkeys/gkeys/lib.py | 7 +++++-- |
| 14 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py |
| 17 |
index e480613..2fe29fb 100644 |
| 18 |
--- a/gkeys/gkeys/actions.py |
| 19 |
+++ b/gkeys/gkeys/actions.py |
| 20 |
@@ -827,8 +827,6 @@ class Actions(ActionBase): |
| 21 |
climit = 60 |
| 22 |
else: |
| 23 |
climit = 0 |
| 24 |
- sig_path = None |
| 25 |
- get_sig = signature is not None |
| 26 |
self.logger.debug(_unicode("ACTIONS: _verify; supplied signature %s"), signature) |
| 27 |
if isurl: |
| 28 |
fetcher = Fetch(self.logger) |
| 29 |
|
| 30 |
diff --git a/gkeys/gkeys/lib.py b/gkeys/gkeys/lib.py |
| 31 |
index a8529f4..7928347 100644 |
| 32 |
--- a/gkeys/gkeys/lib.py |
| 33 |
+++ b/gkeys/gkeys/lib.py |
| 34 |
@@ -88,8 +88,8 @@ class GkeysGPG(GPG): |
| 35 |
|
| 36 |
|
| 37 |
def set_keydir(self, keydir, task, fingerprint=True, reset=True): |
| 38 |
- self.logger.debug("basedir: %s, keydir: %s" % (self.basedir, keydir)) |
| 39 |
self.keydir = pjoin(self.basedir, keydir) |
| 40 |
+ self.logger.debug("GkeysGPG.set_keydir; keydir: %s, task: %s, self.keydir: %s" % (keydir, task, self.keydir)) |
| 41 |
self.task = task |
| 42 |
if reset: |
| 43 |
self.config.options['tasks'][task] = self.config.defaults['tasks'][task][:] |
| 44 |
@@ -98,7 +98,7 @@ class GkeysGPG(GPG): |
| 45 |
task_value.append('--fingerprint') |
| 46 |
task_value.extend(['--homedir', self.keydir]) |
| 47 |
self.config.options['tasks'][task].extend(task_value) |
| 48 |
- self.logger.debug("set_keydir: New task options: %s" %str(self.config.options['tasks'][task])) |
| 49 |
+ self.logger.debug("GkeysGPG.set_keydir; New task options: %s" %str(self.config.options['tasks'][task])) |
| 50 |
return |
| 51 |
|
| 52 |
|
| 53 |
@@ -147,6 +147,8 @@ class GkeysGPG(GPG): |
| 54 |
fingerprint, gkey.name)) |
| 55 |
result = self.runGPG(task='recv-keys', inputfile=fingerprint) |
| 56 |
self.logger.info('GPG return code: ' + str(result.returncode)) |
| 57 |
+ self.logger.debug("LIB: add_key; fingerprint: %s. type: %s", fingerprint, type(fingerprint)) |
| 58 |
+ self.logger.debug("LIB: add_key; gkey.keys: %s. type: %s", gkey.keys, [type(key) for key in gkey.keys]) |
| 59 |
if result.fingerprint in gkey.keys: |
| 60 |
result.failed = False |
| 61 |
message = "Fingerprints match... Import successful: " |
| 62 |
@@ -254,6 +256,7 @@ class GkeysGPG(GPG): |
| 63 |
self.logger.debug("LIB: list_keys(), invalid keydir parameter: %s" |
| 64 |
% str(keydir)) |
| 65 |
return [] |
| 66 |
+ self.logger.debug("LIB: list_keys(), keydir parameter: %s"% str(keydir)) |
| 67 |
if fingerprint: |
| 68 |
task = 'list-key' |
| 69 |
target = fingerprint |
Archives