Merge lp:~devcamcar/django-nova/fix_get_user into lp:django-nova

[Devin Carlen]

Made adminclient get_user return None instead of throwing EC2Exception if requested user not available

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'src/django_nova/adminclient.py'
--- src/django_nova/adminclient.py	2011-01-12 20:02:06 +0000
+++ src/django_nova/adminclient.py	2011-01-28 20:44:57 +0000
@@ -21,6 +21,7 @@
 
 import base64
 import boto
+import boto.exception
 import httplib
 import re
 import string
@@ -332,10 +333,12 @@
 
     def get_user(self, name):
         """ grab a single user by name """
-        user = self.apiconn.get_object('DescribeUser', {'Name': name}, UserInfo)
-
-        if user.username != None:
-            return user
+        try:
+            return self.apiconn.get_object('DescribeUser', {'Name': name}, UserInfo)
+        except boto.exception.BotoServerError, e:
+            if e.status == 400 and e.error_code == 'NotFound':
+                return None
+            raise
 
     def has_user(self, username):
         """ determine if user exists """