summaryrefslogtreecommitdiffstats
path: root/pykolab
diff options
context:
space:
mode:
authorAeneas Jai├čle <aj@ajaissle.de>2014-02-28 13:10:00 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-02-28 13:10:00 +0100
commit1284357760d54029d36bb650e8c7837763e8f1d9 (patch)
tree180db66a9b5b3f0206325dff9b4b870aade32d1a /pykolab
parent5c3413f59c49cbc734fddd2ed25bc25a1beee850 (diff)
downloadpykolab-1284357760d54029d36bb650e8c7837763e8f1d9.tar.gz
With the attached patch, we (openSUSE) are able to identiify a running
MySQL server. Without, only /var/run/mysqld/mysqld.sock is checked, but we use /var/run/mysql/mysql.sock (without a trailing 'd').
Diffstat (limited to 'pykolab')
-rw-r--r--pykolab/setup/setup_mysql.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
index 4b2e8c2..e9783c7 100644
--- a/pykolab/setup/setup_mysql.py
+++ b/pykolab/setup/setup_mysql.py
@@ -64,7 +64,7 @@ def execute(*args, **kw):
}
answer = 0
- if os.path.exists('/var/run/mysqld/mysqld.sock'):
+ if os.path.exists('/var/run/mysqld/mysqld.sock') or os.path.exists('/var/run/mysql/mysql.sock'):
answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
if answer == "1" or answer == 1: