Author: tmckay
Date: 2011-03-28 01:54:09 +0000 (Mon, 28 Mar 2011)
New Revision: 4669
Modified:
trunk/cumin/bin/cumin
trunk/cumin/etc/sysvinit-cumin
Log:
Include of cumin.config has to come after setting of python path.
Tweak debug output in sysvinit-cumin
Modified: trunk/cumin/bin/cumin
===================================================================
--- trunk/cumin/bin/cumin 2011-03-28 01:32:32 UTC (rev 4668)
+++ trunk/cumin/bin/cumin 2011-03-28 01:54:09 UTC (rev 4669)
@@ -5,11 +5,12 @@
import os
import sys
import signal
-from cumin.config import *
home = os.environ.get("CUMIN_HOME",
os.path.normpath("/usr/share/cumin"))
sys.path.append(os.path.join(home, "python"))
+from cumin.config import *
+
from parsley.loggingex import *
log = logging.getLogger("cumin.master")
Modified: trunk/cumin/etc/sysvinit-cumin
===================================================================
--- trunk/cumin/etc/sysvinit-cumin 2011-03-28 01:32:32 UTC (rev 4668)
+++ trunk/cumin/etc/sysvinit-cumin 2011-03-28 01:54:09 UTC (rev 4669)
@@ -22,9 +22,11 @@
cumin-database check &> /dev/null || {
# Run again with output left on for user.
- cumin-database check
echo "Cumin's database is not yet installed"
echo "Run 'cumin-database install' as root"
+
+ echo "(detailed output from cumin-database check:)"
+ cumin-database check
exit 1
}
Show replies by date