From 5ee7607b2c4bbabb3314f5f03129af8b78e97520 Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Wed, 16 May 2012 10:46:47 +0100
Subject: [PATCH] [#2394] Fix bug with creating users, introduced in previous
 commit.

---
 ckan/lib/create_test_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/lib/create_test_data.py b/ckan/lib/create_test_data.py
index fbf18d39265..5965e746b95 100644
--- a/ckan/lib/create_test_data.py
+++ b/ckan/lib/create_test_data.py
@@ -523,7 +523,7 @@ def create_users(cls, user_dicts):
 
     @classmethod
     def _create_user_without_commit(cls, name='', **user_dict):
-        if model.User.by_name(name) or model.User.by_openid(user_dict.get('openid')):
+        if model.User.by_name(name) or (user_dict.get('openid') and model.User.by_openid(user_dict.get('openid'))):
             log.warning('Cannot create user "%s" as it already exists.' % \
                             (name or user_dict['name']))
             return