[pkg-java] r3337 - branches/tomcat5.5/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2007-04-25 10:34:40 +0000 (Wed, 25 Apr 2007)
New Revision: 3337

Modified:
   branches/tomcat5.5/feature/debian/debian/changelog
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
Log:
Don't return LSB exit codes, that breaks stuff in Debian. Return 0 instead.


Modified: branches/tomcat5.5/feature/debian/debian/changelog
===================================================================
--- branches/tomcat5.5/feature/debian/debian/changelog	2007-04-25 08:34:06 UTC (rev 3336)
+++ branches/tomcat5.5/feature/debian/debian/changelog	2007-04-25 10:34:40 UTC (rev 3337)
@@ -4,6 +4,9 @@
     "/var/log/tomcat5.5/catalina.out". (Closes: #402603)
   * debian/rules: Set SHELL=/bin/bash as required. Thamks to David
     Pashley. (Closes: #413845)
+  * The init script no longer returns LSB-compliant exit codes since that
+    conflicts with Debian policy and breaks various things. It now returns
+    0 (success) in most cases.
   * debian/control: Removed Stefan Gybas (on own request) and Wolfgang
     Baer from Uploaders.
 

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2007-04-25 08:34:06 UTC (rev 3336)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2007-04-25 10:34:40 UTC (rev 3337)
@@ -172,14 +172,11 @@
 
 		if [ -f "$CATALINA_PID" ]; then
 		    log_success_msg "$DESC is not running, but pid file exists."
-		    exit 1
 		else
 		    log_success_msg "$DESC is not running."
-		    exit 3
 		fi
 	else
 		log_success_msg "$DESC is running with pid `cat $CATALINA_PID`"
-		exit 0
 	fi
         ;;
   restart|force-reload)