Merge lp:~abentley/lp-dev-utils/ec2-errors into lp:lp-dev-utils

[Aaron Bentley]

Better handling of ec2 user errors.

This just fixes the ec2 error handling so that user errors don't generate tracebacks.

[j.c.sackett (jcsackett)]

Looks good. Thanks.

review: Approve

=== modified file 'ec2'
--- ec2	2012-02-24 20:10:13 +0000
+++ ec2	2012-07-26 15:22:23 +0000
@@ -14,7 +14,7 @@
 import sys
 
 import bzrlib
-from bzrlib.errors import BzrCommandError
+from bzrlib.errors import BzrError
 
 from ec2test import builtins
 from ec2test.controller import (
@@ -46,7 +46,9 @@
             args = ['help']
         try:
             controller.run(args)
-        except BzrCommandError, e:
+        except BzrError as e:
+            if e.internal_error:
+                raise
             sys.exit('ec2: ERROR: ' + str(e))