nova-adminclient

Merge lp:~devcamcar/nova-adminclient/fix-get-user into lp:nova-adminclient

  1. fix-get-user
  2. Merge into trunk
Proposed by Devin Carlen
Status: Merged
Approved by: Devin Carlen
Approved revision: 6
Merged at revision: 6
Proposed branch: lp:~devcamcar/nova-adminclient/fix-get-user
Merge into: lp:nova-adminclient
Diff against target: 25 lines (+2/-2)
2 files modified
nova_adminclient/client.py (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~devcamcar/nova-adminclient/fix-get-user
Reviewer Review Type Date Requested Status
Devin Carlen Approve
Review via email: mp+61851@code.launchpad.net

Description of the change

Modified get_user to check for the UserNotFound error from boto instead of NotFound to match recent changes to nova's exception handling.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova_adminclient/client.py'
2--- nova_adminclient/client.py 2011-05-17 02:29:14 +0000
3+++ nova_adminclient/client.py 2011-05-21 04:37:23 +0000
4@@ -343,7 +343,7 @@
5 {'Name': name},
6 UserInfo)
7 except boto.exception.BotoServerError, e:
8- if e.status == 400 and e.error_code == 'NotFound':
9+ if e.status == 400 and e.error_code == 'UserNotFound':
10 return None
11 raise
12
13
14=== modified file 'setup.py'
15--- setup.py 2011-05-17 03:07:21 +0000
16+++ setup.py 2011-05-21 04:37:23 +0000
17@@ -20,7 +20,7 @@
18 from setuptools import setup, find_packages
19
20 setup(name = "nova-adminclient",
21- version = "0.1.6",
22+ version = "0.1.7",
23 license = 'Apache License (2.0)',
24 description = "client for administering OpenStack Nova",
25 author = 'OpenStack',

Subscribers

People subscribed via source and target branches

to all changes: