Launchpad Developer Utilities

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

  1. ec2-errors
  2. Merge into trunk
Proposed by Aaron Bentley on 2012-07-26
Status: Merged
Approved by: j.c.sackett on 2012-07-26
Approved revision: 120
Merged at revision: 120
Proposed branch: lp:~abentley/lp-dev-utils/ec2-errors
Merge into: lp:lp-dev-utils
Diff against target: 21 lines (+4/-2)
1 file modified
ec2 (+4/-2)
To merge this branch: bzr merge lp:~abentley/lp-dev-utils/ec2-errors
Reviewer Review Type Date Requested Status
j.c.sackett (community) 2012-07-26 Approve on 2012-07-26
Review via email: mp+116891@code.launchpad.net

Commit Message

Better handling of ec2 user errors.

Description of the Change

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

To post a comment you must log in.
j.c.sackett (jcsackett) wrote :

Looks good. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ec2'
2--- ec2 2012-02-24 20:10:13 +0000
3+++ ec2 2012-07-26 15:22:23 +0000
4@@ -14,7 +14,7 @@
5 import sys
6
7 import bzrlib
8-from bzrlib.errors import BzrCommandError
9+from bzrlib.errors import BzrError
10
11 from ec2test import builtins
12 from ec2test.controller import (
13@@ -46,7 +46,9 @@
14 args = ['help']
15 try:
16 controller.run(args)
17- except BzrCommandError, e:
18+ except BzrError as e:
19+ if e.internal_error:
20+ raise
21 sys.exit('ec2: ERROR: ' + str(e))
22
23

Subscribers

People subscribed via source and target branches