File pykolab-0.7.17-SUSE_setup_mysql_services.patch of Package pykolab

Overview Repositories Revisions Requests Users Attributes Meta

File pykolab-0.7.17-SUSE_setup_mysql_services.patch of Package pykolab (Revision a45a8da4463bd3c35cd34670f2c872bb)

Currently displaying revision a45a8da4463bd3c35cd34670f2c872bb , Show latest

diff -Ppru pykolab-0.7.17.orig/pykolab/setup/setup_mysql.py pykolab-0.7.17.mysql/pykolab/setup/setup_mysql.py
--- pykolab-0.7.17.orig/pykolab/setup/setup_mysql.py	2015-10-30 11:34:42.000000000 +0100
+++ pykolab-0.7.17.mysql/pykolab/setup/setup_mysql.py	2015-11-17 15:01:10.401270970 +0100
@@ -62,6 +62,8 @@ def execute(*args, **kw):
     mysqlservice = 'mysqld.service'
     if os.path.isfile('/usr/lib/systemd/system/mariadb.service'):
         mysqlservice = 'mariadb.service'
+    elif os.path.isfile('/usr/lib/systemd/system/mysql.service'):
+        mysqlservice = 'mysql.service'
     if os.path.isfile('/bin/systemctl') and not os.path.isfile('/usr/lib/systemd/system/' + mysqlservice):
         # on Debian Jessie, systemctl restart mysql
         mysqlservice = 'mysql'
@@ -69,7 +71,10 @@ def execute(*args, **kw):
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['/bin/systemctl', 'restart', mysqlservice])
     elif os.path.isfile('/sbin/service'):
-        subprocess.call(['/sbin/service', 'mysqld', 'restart'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/service', 'mysql', 'restart'])
+        else:
+            subprocess.call(['/sbin/service', 'mysqld', 'restart'])
     elif os.path.isfile('/usr/sbin/service'):
         subprocess.call(['/usr/sbin/service','mysql','restart'])
     else:
@@ -78,7 +83,10 @@ def execute(*args, **kw):
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['/bin/systemctl', 'enable', mysqlservice])
     elif os.path.isfile('/sbin/chkconfig'):
-        subprocess.call(['/sbin/chkconfig', 'mysqld', 'on'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/chkconfig', 'mysql', 'on'])
+        else:
+            subprocess.call(['/sbin/chkconfig', 'mysqld', 'on'])
     elif os.path.isfile('/usr/sbin/update-rc.d'):
         subprocess.call(['/usr/sbin/update-rc.d', 'mysql', 'defaults'])
     else:

Places

File pykolab-0.7.17-SUSE_setup_mysql_services.patch of Package pykolab (Revision a45a8da4463bd3c35cd34670f2c872bb)

Places