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
343
                                           {'Name': name},
343
                                           {'Name': name},
6
344
                                           UserInfo)
344
                                           UserInfo)
7
345
        except boto.exception.BotoServerError, e:
345
        except boto.exception.BotoServerError, e:
9
346
            if e.status == 400 and e.error_code == 'NotFound':
346
            if e.status == 400 and e.error_code == 'UserNotFound':
10
347
                return None
347
                return None
11
348
            raise
348
            raise
12
349
349
13
350
350
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
20
from setuptools import setup, find_packages
20
from setuptools import setup, find_packages
19
21
21
20
22
setup(name = "nova-adminclient",
22
setup(name = "nova-adminclient",
22
23
      version = "0.1.6",
23
      version = "0.1.7",
23
24
      license = 'Apache License (2.0)',
24
      license = 'Apache License (2.0)',
24
25
      description = "client for administering OpenStack Nova",
25
      description = "client for administering OpenStack Nova",
25
26
      author = 'OpenStack',
26
      author = 'OpenStack',
Status:	Merged
Approved by:	Devin Carlen on 2011-05-21
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Devin Carlen			Approve on 2011-05-21
Review via email: mp+61851@code.launchpad.net
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	343	{'Name': name},	343	{'Name': name},
6	344	UserInfo)	344	UserInfo)
7	345	except boto.exception.BotoServerError, e:	345	except boto.exception.BotoServerError, e:
9	346	if e.status == 400 and e.error_code == 'NotFound':	346	if e.status == 400 and e.error_code == 'UserNotFound':
10	347	return None	347	return None
11	348	raise	348	raise
12	349		349
13	350		350
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	20	from setuptools import setup, find_packages	20	from setuptools import setup, find_packages
19	21		21
20	22	setup(name = "nova-adminclient",	22	setup(name = "nova-adminclient",
22	23	version = "0.1.6",	23	version = "0.1.7",
23	24	license = 'Apache License (2.0)',	24	license = 'Apache License (2.0)',
24	25	description = "client for administering OpenStack Nova",	25	description = "client for administering OpenStack Nova",
25	26	author = 'OpenStack',	26	author = 'OpenStack',