Checks if groups is none before extending it

saltstack · Mar 20, 2013 · 0042ac2 · yml · Mar 20, 2013 · 0042ac2
1 parent 2b61586
commit 0042ac2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/salt/states/user.py b/salt/states/user.py
@@ -302,7 +302,10 @@ def present(name,
             ret['result'] = None
             ret['comment'] = 'User {0} set to be added'.format(name)
             return ret
-        groups.extend(present_optgroups)
+        if groups:
+            groups.extend(present_optgroups)
+        elif present_optgroups:
+            groups = present_optgroups[:]
         if __salt__['user.add'](name,
                                 uid=uid,
                                 gid=gid,