Branch 'pykolab-0.5' - pykolab/setup

[Jeroen van Meeuwen]

 pykolab/setup/setup_ldap.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 654c8c9d0f6cceafcdcbbb10704d5c28fbd16f5e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Sep 9 15:04:19 2012 +0100

    Fix path for setup-ds-admin on Debian

diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index 4b6f6c8..b1b76dc 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -222,8 +222,13 @@ ServerAdminPwd = %(admin_pass)s
     os.write(fp, data)
     os.close(fp)
 
+    setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
+
+    if not os.path.isfile(setup_ds_admin):
+        setup_ds_admin = "/usr/sbin/setup-ds-admin"
+
     command = [
-            '/usr/sbin/setup-ds-admin.pl',
+            setup_ds_admin,
             '--debug',
             '--silent',
             '--force',