[pkg-java] r12786 - trunk/jetty/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2010-07-20 20:56:48 +0000 (Tue, 20 Jul 2010)
New Revision: 12786

Modified:
   trunk/jetty/debian/changelog
   trunk/jetty/debian/jetty.init
Log:
Fixed logrotate issue and broken init restart.

Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2010-07-20 20:56:45 UTC (rev 12785)
+++ trunk/jetty/debian/changelog	2010-07-20 20:56:48 UTC (rev 12786)
@@ -3,6 +3,10 @@
   * Removed Depends on JREs for library packages, no longer required
     by the policy.
   * Added missing depends on JREs for the jetty package.
+  * Made init script ignore weird exit statuses from logrotate.
+    (Closes: 589681, LP: #607202)
+  * Fixed broken restart command in jetty init script. Was missing a
+    negation.
 
  -- Niels Thykier <niels at thykier.net>  Mon, 05 Jul 2010 22:28:14 +0200
 

Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init	2010-07-20 20:56:45 UTC (rev 12785)
+++ trunk/jetty/debian/jetty.init	2010-07-20 20:56:48 UTC (rev 12786)
@@ -270,7 +270,7 @@
 		if [ -s "$LOGDIR/out.log" ]; then
 			log_progress_msg "Rotate logs"
 			$ROTATELOGS "$LOGDIR/out.log" 86400 \
-				< "$LOGDIR/out.log"
+				< "$LOGDIR/out.log" || true
 		fi
 		> "$LOGDIR/out.log"
 		chown -R $JETTY_USER:adm "$LOGDIR"
@@ -370,7 +370,7 @@
 	;;
 
   restart|force-reload)
-	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+	if ! start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
 		--user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
 		$0 stop $*
 		sleep 1