commit: 22173b6b70d6c1ba88249cf948801365cb1f64e1
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 31 03:33:59 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 31 04:40:29 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=22173b6b
gkeys/actions.py: separate the message info substitution
It is usually the result.username that gives the error.
This tries to trap it and keep going.
---
gkeys/gkeys/actions.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index dfc9f09..3852372 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -308,10 +308,11 @@ class Actions(object):
msg = _unicode("key desired: %(name)s, key added: %(key)s,
succeeded:" +\
" %(success)s, fingerprint: %(fpr)s")
for result in results[key.name]:
- try:
- print(msg % ({'name': key.name, 'key':
result.username,
+ umsg = msg % ({'name': key.name, 'key':
result.username,
'success': str(not result.failed),
- 'fpr': result.fingerprint}))
+ 'fpr': result.fingerprint})
+ try:
+ print(umsg)
except UnicodeDecodeError:
print(_unicode("UnicodeDecodeError printing
results for:"), key.name)
self.logger.debug(_unicode("installkey();
UnicodeDecodeError for:") + key.name)
