[oldimporter] Fixed exception in import_admins

ninuxorg · Oct 16, 2015 · 2d7adf5 · 2d7adf5
1 parent a4a6cb2
commit 2d7adf5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/nodeshot/interop/oldimporter/management/commands/import_old_nodeshot.py b/nodeshot/interop/oldimporter/management/commands/import_old_nodeshot.py
@@ -355,7 +355,7 @@ def import_admins(self):
 
         for olduser in OldUser.objects.all():
             try:
-                user = User.objects.get(username=olduser.username)
+                user = User.objects.get(Q(username=olduser.username) | Q(email=olduser.email))
             except User.DoesNotExist:
                 user = User()
             user.username = olduser.username
@@ -455,12 +455,12 @@ def import_users(self):
                     user = User.objects.get(email=email)
                 # otherwise report error
                 else:
-                    user = None
                     tb = traceback.format_exc()
                     self.message('Could not save user %s, got exception:\n\n%s' % (user.username, tb))
+                    continue
 
             # if we got a user to add
-            if user is not None:
+            if user:
                 # store id
                 self.users_dict[email]['id'] = user.id
                 # append to saved users