File pykolab-0.7.11-SUSE_setup_mysql_services.patch of Package pykolab

Overview Repositories Revisions Requests Users Attributes Meta

File pykolab-0.7.11-SUSE_setup_mysql_services.patch of Package pykolab (Revision a11457f5b94f367da7b867f975ae6856)

Currently displaying revision a11457f5b94f367da7b867f975ae6856 , Show latest

diff -Ppru pykolab-0.7.11.orig/pykolab/setup/setup_mysql.py pykolab-0.7.11_SUSE_setup_mysql_services/pykolab/setup/setup_mysql.py
--- pykolab-0.7.11.orig/pykolab/setup/setup_mysql.py	2015-03-27 15:24:53.000000000 +0100
+++ pykolab-0.7.11_SUSE_setup_mysql_services/pykolab/setup/setup_mysql.py	2015-04-01 10:23:25.264095450 +0200
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from platform import linux_distribution
 import os
 import subprocess
 import tempfile
@@ -43,11 +44,16 @@ 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'):
         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:
@@ -56,7 +62,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.11-SUSE_setup_mysql_services.patch of Package pykolab (Revision a11457f5b94f367da7b867f975ae6856)

Places