Merge lp:~devcamcar/horizon/lp735759 into lp:~hudson-openstack/horizon/trunk

[Devin Carlen]

Fixed an issue where some auth drivers would cause get_user to fail.

DbDriver and LdapDriver behave differently so my original fix was insufficient. This branch covers all cases.

[lp:~devcamcar/horizon/lp735759]

25. By Devin Carlen on 2011-03-16

Patch to make get_user work with all auth drivers

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'django-nova/src/django_nova/adminclient.py'
--- django-nova/src/django_nova/adminclient.py	2011-03-10 10:59:33 +0000
+++ django-nova/src/django_nova/adminclient.py	2011-03-16 23:08:24 +0000
@@ -334,12 +334,16 @@
     def get_user(self, name):
         """ grab a single user by name """
         try:
-            return self.apiconn.get_object('DescribeUser', {'Name': name}, UserInfo)
+            user = 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
 
+        if user.username != None:
+            return user
+
+
     def has_user(self, username):
         """ determine if user exists """
         return self.get_user(username) != None