mailman/contribs9/mailman-2.1.12-initcleanup.patch

diff -up mailman-2.1.12/misc/mailman.in.initcleanup mailman-2.1.12/misc/mailman.in
--- mailman-2.1.12/misc/mailman.in.initcleanup  2009-10-05 09:09:35.000000000 -0400
+++ mailman-2.1.12/misc/mailman.in      2009-10-05 17:53:56.000000000 -0400
@@ -91,6 +91,8 @@ function start()
     then
        touch /var/lock/subsys/$prog
        InstallCron
+    else
+        RETVAL=6       
     fi
     echo
     return $RETVAL
@@ -98,6 +100,8 @@ function start()
 
 function stop()
 {
+    if [ -f /var/lock/subsys/$prog ]
+    then
     echo -n $"Shutting down $prog: "
     mailman-update-cfg
     daemon $MAILMANCTL -q stop
@@ -108,6 +112,10 @@ function stop()
        RemoveCron
     fi
     echo
+    else
+    echo $"$prog already stopped."
+    RETVAL=0
+    fi
     return $RETVAL
 }
 
@@ -135,7 +143,7 @@ case "$1" in
     RETVAL=$?
     ;;
 
-'condrestart')
+'condrestart'|'try-restart')
     $MAILMANCTL -q -u status
     retval=$?
     if [ $retval -eq 0 ]
@@ -146,13 +154,20 @@ case "$1" in
     ;;
 
 'status')
-    $MAILMANCTL -u status
+    output=$($MAILMANCTL -u status)
     RETVAL=$?
+    if [ $RETVAL -eq 3 -a -f /var/lock/subsys/$prog ]
+    then
+        echo $"$prog dead but subsys locked"
+        RETVAL=2
+    else
+        echo $output
+    fi
     ;;
 
 *)
-    echo $"Usage: $prog {start|stop|restart|force-reload|condrestart|status}"
-    RETVAL=3
+    echo $"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}"
+    RETVAL=2
     ;;
 
 esac
1	diff -up mailman-2.1.12/misc/mailman.in.initcleanup mailman-2.1.12/misc/mailman.in
2	--- mailman-2.1.12/misc/mailman.in.initcleanup 2009-10-05 09:09:35.000000000 -0400
3	+++ mailman-2.1.12/misc/mailman.in 2009-10-05 17:53:56.000000000 -0400
4	@@ -91,6 +91,8 @@ function start()
5	then
6	touch /var/lock/subsys/$prog
7	InstallCron
8	+ else
9	+ RETVAL=6
10	fi
11	echo
12	return $RETVAL
13	@@ -98,6 +100,8 @@ function start()
14
15	function stop()
16	{
17	+ if [ -f /var/lock/subsys/$prog ]
18	+ then
19	echo -n $"Shutting down $prog: "
20	mailman-update-cfg
21	daemon $MAILMANCTL -q stop
22	@@ -108,6 +112,10 @@ function stop()
23	RemoveCron
24	fi
25	echo
26	+ else
27	+ echo $"$prog already stopped."
28	+ RETVAL=0
29	+ fi
30	return $RETVAL
31	}
32
33	@@ -135,7 +143,7 @@ case "$1" in
34	RETVAL=$?
35	;;
36
37	-'condrestart')
38	+'condrestart'\|'try-restart')
39	$MAILMANCTL -q -u status
40	retval=$?
41	if [ $retval -eq 0 ]
42	@@ -146,13 +154,20 @@ case "$1" in
43	;;
44
45	'status')
46	- $MAILMANCTL -u status
47	+ output=$($MAILMANCTL -u status)
48	RETVAL=$?
49	+ if [ $RETVAL -eq 3 -a -f /var/lock/subsys/$prog ]
50	+ then
51	+ echo $"$prog dead but subsys locked"
52	+ RETVAL=2
53	+ else
54	+ echo $output
55	+ fi
56	;;
57
58	*)
59	- echo $"Usage: $prog {start\|stop\|restart\|force-reload\|condrestart\|status}"
60	- RETVAL=3
61	+ echo $"Usage: $prog {start\|stop\|restart\|force-reload\|condrestart\|try-restart\|status}"
62	+ RETVAL=2
63	;;
64
65	esac