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

["Brian Dolbec" <dolsen@gentoo.org>]

commit:     24e501c6dd471b69d262b27f254c197afcefc847
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 10 22:13:56 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 22:13:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=24e501c6

gkeys-gen: Improve output by stating the error that occurred

The debug output in the log is not obvious, so stating it as well as the log file should help.

 gkeys-gen/gkeygen/actions.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gkeys-gen/gkeygen/actions.py b/gkeys-gen/gkeygen/actions.py
index 649eed7..0bc34cd 100644
--- a/gkeys-gen/gkeygen/actions.py
+++ b/gkeys-gen/gkeygen/actions.py
@@ -27,6 +27,7 @@ else:
     _unicode = unicode
 
 from gkeys.fileops import ensure_dirs
+from gkeys import log
 
 
 Action_Map = OrderedDict([
@@ -174,8 +175,10 @@ class Actions(object):
                 result = ctx.genkey(key_params)
             except gpgme.GpgmeError as e:
                 self.logger.debug("MAIN: _action_genkey: GpgmeError: %s" % str(e))
-                self.logger.debug("MAIN: _action_genkey: Aborting... Failed to get a password.")
-                messages.extend(['', "Aborting... Failed to get a password."])
+                self.logger.debug("MAIN: _action_genkey: Aborting... Gpgme errored out.")
+                messages.extend(['', "Aborting... Gpgme reported an error.\n",
+                    "    GpgmeError: %s\n" % str(e),
+                    "    See the log file for details: %s" % log.logname])
                 return (False, messages)
             key = ctx.get_key(result.fpr, True)
             self.logger.debug("MAIN: _action_genkey: Generated key: %s - %s"