summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-11-25 10:32:01 +0000
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-11-25 10:57:19 +0000
commitb825ff4493e15a751f0bee4291f7e4c0fa5cf5e2 (patch)
tree0f800769e3de02e71e3a1f24af508f54bd98a0f8
parentc8c62fd5efa8fac3010a5ec9da84ba4ed202a847 (diff)
downloadpykolab-b825ff4493e15a751f0bee4291f7e4c0fa5cf5e2.tar.gz
Really only ask the question what MySQL we are setting up if /var/run/mysqld/mysqld.sock exists
-rw-r--r--pykolab/setup/setup_mysql.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
index 8d419ad..1c5fd0c 100644
--- a/pykolab/setup/setup_mysql.py
+++ b/pykolab/setup/setup_mysql.py
@@ -63,7 +63,9 @@ def execute(*args, **kw):
2: "New MySQL server (needs to be initialized)."
}
- answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
+ answer = 0
+ if os.path.exists('/var/run/mysqld/mysqld.sock'):
+ answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
if answer == "1" or answer == 1:
print >> sys.stderr, utils.multiline_message(