Fix command execute method.

1 files changed, 11 insertions, 7 deletions

diff --git a/scripts/ldap_sync.py b/scripts/ldap_sync.py
index 09a2d6a..4f7d08f 100644
--- a/scripts/ldap_sync.py
+++ b/scripts/ldap_sync.py
@@ -57,8 +57,7 @@ class SystemCommand():
 
         with open(os.devnull, 'w') as tempf:
             process = subprocess.Popen(cmd_args, stdout=subprocess.PIPE,
-                                       stderr=subprocess.PIPE, shell=True,
-                                       env=os.environ)
+                                       stderr=subprocess.PIPE)
             (stdout, stderr) = process.communicate()
 
         if process.returncode != 0:
@@ -68,7 +67,7 @@ class SystemCommand():
             logger.debug("Sucess executing command %s. Output: %s" % (cmd_args,
                                                                       stdout))
 
-            return stdout
+        return stdout
 
     @classmethod
     def add_group(cls, groupname):
@@ -93,10 +92,13 @@ class SystemCommand():
 
     @classmethod
     def get_group_members(cls, groupname):
-        cmd_args = ["members --all %s" % groupname]
-        output = cls.execute(cmd_args, with_sudo=False)
-        users = output.split()
-        return users
+        cmd_args = ["members", "--all", groupname]
+        try:
+            output = cls.execute(cmd_args)
+            users = set(output.split())
+            return users
+        except:
+            return {}
 
 
 class RhodecodeAPI():
@@ -353,6 +355,8 @@ class LdapSync():
                 SystemCommand.remove_user_from_group(group, system_member)
 
         # Add memberships.
+        logger.debug("Add memberships.")
+
         for member in group_users:
             SystemCommand.add_user_to_group(group, member)