[or-cvs] r16038: Tweak a few error messages in the init script to use the pro (tor/branches/tor-0_2_0-patches/debian)

[weasel at seul.org]

Author: weasel
Date: 2008-07-17 19:57:57 -0400 (Thu, 17 Jul 2008)
New Revision: 16038

Modified:
   tor/branches/tor-0_2_0-patches/debian/changelog
   tor/branches/tor-0_2_0-patches/debian/tor.init
Log:
Tweak a few error messages in the init script to use the proper variables (not
that it should matter, the Right One has the same value, but still) and to list
more possible error reasons.


Modified: tor/branches/tor-0_2_0-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/changelog	2008-07-17 23:54:34 UTC (rev 16037)
+++ tor/branches/tor-0_2_0-patches/debian/changelog	2008-07-17 23:57:57 UTC (rev 16038)
@@ -1,3 +1,11 @@
+tor (0.2.0.30-X) unstable; urgency=low
+
+  * Tweak a few error messages in the init script to use the proper variables
+    (not that it should matter, the Right One has the same value, but still)
+    and to list more possible error reasons.
+
+ -- Peter Palfrader <weasel at debian.org>  Fri, 18 Jul 2008 01:56:04 +0200
+
 tor (0.2.0.30-2) unstable; urgency=low
 
   * Stop requiring that the binary in /usr/sbin/tor is still the same as the

Modified: tor/branches/tor-0_2_0-patches/debian/tor.init
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/tor.init	2008-07-17 23:54:34 UTC (rev 16037)
+++ tor/branches/tor-0_2_0-patches/debian/tor.init	2008-07-17 23:57:57 UTC (rev 16038)
@@ -151,9 +151,9 @@
 		echo "$NAME."
 	elif kill -0 $pid 2>/dev/null
 	then
-		echo "FAILED (Is $pid not $NAME?)."
+		echo "FAILED (Is $pid not $DAEMON_NAME or not running as $DAEMON_USER?)."
 	else
-		echo "FAILED ($DAEMON died: process $pid not running; or permission denied)."
+		echo "FAILED ($DAEMON_NAME died: process $pid not running; or permission denied)."
 	fi
 	;;
   reload|force-reload)
@@ -172,9 +172,9 @@
 		echo "$NAME."
 	elif kill -0 $pid 2>/dev/null
 	then
-		echo "FAILED (Is $pid not $NAME?)."
+		echo "FAILED (Is $pid not $DAEMON_NAME or not running as $DAEMON_USER?)."
 	else
-		echo "FAILED ($DAEMON died: process $pid not running; or permission denied)."
+		echo "FAILED ($DAEMON_NAME died: process $pid not running; or permission denied)."
 	fi
 	;;
   restart)