From 936b4eb9e5de7109f294b17f2d9c2c842535e40c Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Fri, 10 Aug 2012 19:24:33 +0100
Subject: [PATCH] Fixed some minor error reporting bugs

- Using -v no longer showed stacktraces for exceptions.
- Displaying exceptions on Python 3 didn't work properly due to missing
  unicode() builtin.
---
 zeroinstall/cmd/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zeroinstall/cmd/__init__.py b/zeroinstall/cmd/__init__.py
index 2d1b623..3005673 100644
--- a/zeroinstall/cmd/__init__.py
+++ b/zeroinstall/cmd/__init__.py
@@ -93,6 +93,7 @@ def main(command_args, config = None):
 
 		cmd.add_options(parser)
 		(options, args) = parser.parse_args(command_args)
+		verbose = options.verbose
 
 		if options.verbose:
 			logger = logging.getLogger()
@@ -121,6 +122,7 @@ def main(command_args, config = None):
 	except SafeException as ex:
 		if verbose: raise
 		try:
+			from zeroinstall.support import unicode
 			print(unicode(ex), file=sys.stderr)
 		except:
 			print(repr(ex), file=sys.stderr)
-- 
2.11.4.GIT