diff options
author | Johannes Graumann <johannes_graumann@web.de> | 2012-10-15 22:29:10 +0300 |
---|---|---|
committer | Johannes Graumann <johannes_graumann@web.de> | 2012-10-15 22:29:10 +0300 |
commit | cc0c41beccb06fe7de7111affb96e3f0194ac839 (patch) | |
tree | f9c59c11659cabd262e31df47fd226363a497543 /pykolab | |
parent | e9ef1e603f007600868953d912c509dc35be4bba (diff) | |
download | pykolab-cc0c41beccb06fe7de7111affb96e3f0194ac839.tar.gz |
Debianize: Adapt setup-ds* paths;
Diffstat (limited to 'pykolab')
-rw-r--r-- | pykolab/setup/setup_ldap.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py index 4f91dd2..b28ac49 100644 --- a/pykolab/setup/setup_ldap.py +++ b/pykolab/setup/setup_ldap.py @@ -223,11 +223,15 @@ 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" - + if os.path.isfile("/usr/sbin/setup-ds-admin.pl"): + setup_ds_admin = "/usr/sbin/setup-ds-admin.pl" +# elif os.path.isfile("/usr/sbin/setup-ds-admin"): +# setup_ds_admin = "/usr/sbin/setup-ds-admin" + elif os.path.isfile("/usr/sbin/setup-ds"): + setup_ds_admin = "/usr/sbin/setup-ds" + else: + log.error(_("No directory server setup tool available.")) + command = [ setup_ds_admin, '--debug', |