Avoid conflicting options.

If you're a superuser, you already have permissions to create a user. Postgres will complain about conflicting options if you attempt to pass both. Refs #8717.
saltstack · Dec 6, 2013 · eb20421 · eb20421
1 parent 652ee5b
commit eb20421
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/modules/postgres.py b/salt/modules/postgres.py
@@ -529,7 +529,7 @@ def _role_create(name,
         sub_cmd = '{0} PASSWORD {1!r}'.format(sub_cmd, escaped_password)
     if createdb:
         sub_cmd = '{0} CREATEDB'.format(sub_cmd)
-    if createuser:
+    if createuser and not superuser:
         sub_cmd = '{0} CREATEUSER'.format(sub_cmd)
     if superuser:
         sub_cmd = '{0} SUPERUSER'.format(sub_cmd)