From 0e3eae153e9f8fcc98a295065a87fcf851ba175b Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Thu, 17 Sep 2015 12:29:42 -0700 Subject: [PATCH 1/3] Hide tracebacks, but not the ultimate error itself --- letsencrypt/cli.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index ab03a576f..a413cdf8e 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -845,14 +845,17 @@ def _handle_exception(exc_type, exc_value, trace, args): if issubclass(exc_type, errors.Error): sys.exit(exc_value) - elif args is None: - sys.exit( - "An unexpected error occurred. Please see the logfile '{0}' " - "for more details.".format(logfile)) else: - sys.exit( - "An unexpected error occurred. Please see the logfiles in {0} " - "for more details.".format(args.logs_dir)) + # Tell the user a bit about what happened, without overwhelming + # them with a full traceback + msg = "An unexpected error occurred.\n" + msg += traceback.format_exception_only(exc_type,exc_value)[0] + msg += "\nPlease see the " + if args is None: + msg += "logfile '{0}' for more details.".format(logfile) + else: + msg += "logfiles in {0} for more details.".format(args.logs_dir) + sys.exit(msg) else: sys.exit("".join( traceback.format_exception(exc_type, exc_value, trace))) From 7c67df107636a6058a975b4a1392987bfdc5fa90 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Thu, 17 Sep 2015 12:48:07 -0700 Subject: [PATCH 2/3] traceback actually provides that \n --- letsencrypt/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index a413cdf8e..739385206 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -850,7 +850,7 @@ def _handle_exception(exc_type, exc_value, trace, args): # them with a full traceback msg = "An unexpected error occurred.\n" msg += traceback.format_exception_only(exc_type,exc_value)[0] - msg += "\nPlease see the " + msg += "Please see the " if args is None: msg += "logfile '{0}' for more details.".format(logfile) else: From 6c4d9e932407f0932d04f757694b54ad9da50ab2 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Thu, 17 Sep 2015 13:00:03 -0700 Subject: [PATCH 3/3] Satisfy the lintmonster --- letsencrypt/cli.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index 739385206..dcd1e55b1 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -848,13 +848,13 @@ def _handle_exception(exc_type, exc_value, trace, args): else: # Tell the user a bit about what happened, without overwhelming # them with a full traceback - msg = "An unexpected error occurred.\n" - msg += traceback.format_exception_only(exc_type,exc_value)[0] - msg += "Please see the " + msg = ("An unexpected error occurred.\n" + + traceback.format_exception_only(exc_type, exc_value)[0] + + "Please see the ") if args is None: - msg += "logfile '{0}' for more details.".format(logfile) + msg += "logfile '{0}' for more details.".format(logfile) else: - msg += "logfiles in {0} for more details.".format(args.logs_dir) + msg += "logfiles in {0} for more details.".format(args.logs_dir) sys.exit(msg) else: sys.exit("".join(