Merge pull request saltstack#4096 from s0undt3ch/hotfix/fix-travis-again

thatch45 · thatch45 · commit 3634e66c1c61 · 2013-03-14T08:58:53.000-07:00
Fix `None` is not iterable exhibited while running `integration.states.user.UserTest`
diff --git a/salt/modules/useradd.py b/salt/modules/useradd.py
@@ -87,7 +87,7 @@ def add(name,
         cmd += '-u {0} '.format(uid)
     if gid not in (None, ''):
         cmd += '-g {0} '.format(gid)
-    elif name in groups:
+    elif groups is not None and name in groups:
         def usergroups():
             retval = False
             try:
