commit: 5217031811549514076e29f4e349fdec68042ad3
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 5 00:52:29 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 5 22:15:18 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=52170318
gkeys/seed.py: Downgrade logger.error msgs to debug if trap_errors is set True
Go direct to logger.debug()
gkeys/lib.py: Silence error noise for a new key install
---
gkeys/gkeys/lib.py | 2 +-
gkeys/gkeys/seed.py | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/gkeys/gkeys/lib.py b/gkeys/gkeys/lib.py
index 6020322..4ae534d 100644
--- a/gkeys/gkeys/lib.py
+++ b/gkeys/gkeys/lib.py
@@ -134,7 +134,7 @@ class GkeysGPG(GPG):
self.logger.debug("LIB: add_key; ensure dirs: " + self.keydir)
mode = int(self.config.get_key('permissions', 'directories'),0)
ensure_dirs(str(self.keydir), mode=mode)
- self.set_keyseedfile(trap_errors=False)
+ self.set_keyseedfile(trap_errors=True)
results = []
for fingerprint in gkey.keys:
self.logger.debug("LIB: add_key; adding fingerprint " +
fingerprint)
diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py
index 7d9ae4e..a84003d 100644
--- a/gkeys/gkeys/seed.py
+++ b/gkeys/gkeys/seed.py
@@ -56,6 +56,8 @@ class Seeds(object):
except IOError as err:
self.logger.debug("Seed: load; IOError occurred while loading
file")
if trap_errors:
+ self.logger.debug("Seed: load; %s" % str(err))
+ else:
self._error(err)
return False
for seed in list(seedlines.items()):
@@ -216,10 +218,14 @@ class Seeds(object):
return False
- def _error(self, err):
+ def _error(self, err, debug=False):
'''Class error logging function'''
- self.logger.error("Seed: Error processing seed file %s" %
self.filename)
- self.logger.error("Seed: Error was: %s" % str(err))
+ if debug:
+ self.logger.debug("Seed: Error processing seed file %s" %
self.filename)
+ self.logger.debug("Seed: Error was: %s" % str(err))
+ else:
+ self.logger.error("Seed: Error processing seed file %s" %
self.filename)
+ self.logger.error("Seed: Error was: %s" % str(err))
def _seeds2json(self, seeds):
