Kolab Groupware OBS

Changes of Revision 133

pykolab.spec Changed

fix_disrvadmin_centos7.patch Added

@@ -0,0 +1,29 @@
+From 5c2b539828cab0e83dca72e40ccb2f296dd5611a Mon Sep 17 00:00:00 2001
+From: Timotheus Pokorra <tp@tbits.net>
+Date: Thu, 12 Feb 2015 16:30:53 +0100
+Subject: [PATCH 2/2] show meaningful error message if dirsrv-admin.service
+ does not exist fixes #4554
+
+---
+ pykolab/setup/setup_ldap.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
+index 04311d2..c805d20 100644
+--- a/pykolab/setup/setup_ldap.py
++++ b/pykolab/setup/setup_ldap.py
+@@ -670,7 +670,10 @@ ServerAdminPwd = %(admin_pass)s
+     auth._auth.ldap.modify_s(dn, modlist)
+ 
+     if os.path.isfile('/bin/systemctl'):
+-        subprocess.call(['/bin/systemctl', 'enable', 'dirsrv-admin.service'])
++        if not os.path.isfile('/usr/lib/systemd/system/dirsrv-admin.service'):
++            log.info(_("directory server admin service not available"))
++        else:
++            subprocess.call(['/bin/systemctl', 'enable', 'dirsrv-admin.service'])
+     elif os.path.isfile('/sbin/chkconfig'):
+         subprocess.call(['/sbin/chkconfig', 'dirsrv-admin', 'on'])
+     elif os.path.isfile('/usr/sbin/update-rc.d'):
+-- 
+1.8.3.1
+