[pkg-java] r8268 - trunk/tomcat6/debian

[Marcus Better]

Author: marcusb-guest
Date: 2009-05-18 14:39:42 +0000 (Mon, 18 May 2009)
New Revision: 8268

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.init
Log:
Let the init script exit silently if the package is
uninstalled. (Closes: #529301)

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-05-18 12:20:06 UTC (rev 8267)
+++ trunk/tomcat6/debian/changelog	2009-05-18 14:39:42 UTC (rev 8268)
@@ -1,3 +1,10 @@
+tomcat6 (6.0.18-5) UNRELEASED; urgency=low
+
+  * Let the init script exit silently if the package is
+    uninstalled. (Closes: #529301)
+
+ -- Marcus Better <marcus at better.se>  Mon, 18 May 2009 16:39:26 +0200
+
 tomcat6 (6.0.18-4) unstable; urgency=low
 
   * Add patch tcnative-ipv6-fix-43327.patch provided by Thierry Carrez.

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2009-05-18 12:20:06 UTC (rev 8267)
+++ trunk/tomcat6/debian/tomcat6.init	2009-05-18 14:39:42 UTC (rev 8268)
@@ -88,10 +88,7 @@
 	exit 1
 fi
 
-if [ ! -f "$DAEMON" ]; then
-	log_failure_msg "missing $DAEMON"
-	exit 1
-fi
+[ -f "$DAEMON" ] || exit 0
 
 POLICY_CACHE="$CATALINA_BASE/work/catalina.policy"