[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/2.9.5-2-84-g7c7b498

Mehdi Dogguy dogguy at pps.jussieu.fr
Mon Mar 16 15:30:42 UTC 2009


The following commit has been merged in the master branch:
commit 7c7b498bd40ba7850c66f0ce71f6d5e408e5d7e7
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Mon Mar 16 16:27:32 2009 +0100

    Don't fail when SERVERLOG is not present

diff --git a/debian/mldonkey-server.init b/debian/mldonkey-server.init
index fe983c2..43f8ac6 100644
--- a/debian/mldonkey-server.init
+++ b/debian/mldonkey-server.init
@@ -54,7 +54,7 @@ Error ()
 
 StartErrorCheck ()
 {
-    if tail -n 2 $SERVERLOG | grep -qi 'aborting' ; then
+    if [ -f "$SERVERLOG" ] && tail -n 2 "$SERVERLOG" | grep -qi 'aborting' ; then
         Warn "$DESC: $NAME [ERROR] server start error"
         tail --verbose $SERVERLOG
         exit 1
@@ -67,8 +67,12 @@ StartErrorCheck ()
 if [ ! -d /var/run/mldonkey ]; then
     mkdir -m 755 /var/run/mldonkey
 fi
+if [ ! -d /var/log/mldonkey ]; then
+    mkdir -m 755 /var/log/mldonkey
+fi
 if [ -n "$MLDONKEY_USER" ] && [ -n "$MLDONKEY_GROUP" ]; then
     chown $MLDONKEY_USER:$MLDONKEY_GROUP /var/run/mldonkey
+    chown $MLDONKEY_USER:$MLDONKEY_GROUP /var/log/mldonkey
 fi
 
 WRAPPER_OPTIONS=""

-- 
mldonkey packaging



More information about the Pkg-ocaml-maint-commits mailing list