[Python-apps-commits] r3875 - in packages/sabnzbdplus/trunk/debian (2 files)

[jcfp-guest at users.alioth.debian.org]

    Date: Wednesday, September 30, 2009 @ 21:35:41
  Author: jcfp-guest
Revision: 3875

Minor init.d tweaks

Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/sabnzbdplus.init

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2009-09-29 21:37:47 UTC (rev 3874)
+++ packages/sabnzbdplus/trunk/debian/changelog	2009-09-30 21:35:41 UTC (rev 3875)
@@ -12,9 +12,11 @@
     the exclusive use of Python 2.5.
   * Documenting Python 2.6 compatibility issue in debian/README.source.
   * Updated man page.
-  * Make the init script run later, so that all networking is already
-    configured at startup, and add NetworkManager as a Should-Start,Stop
-    dependency to the LSB Init Info. (LP: #402045)
+  * Init.d script:
+    + run later, so all networking is already configured at startup, and
+      add NetworkManager as a Should-Start,Stop. dependency to the LSB
+      Init Info. (LP: #402045)
+    + assorted minor tweaks.
   * Changed Priority to extra, following dependency python-cherrypy that
     was demoted from optional to extra in 2.3.0-3.
 

Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.init
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.init	2009-09-29 21:37:47 UTC (rev 3874)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.init	2009-09-30 21:35:41 UTC (rev 3875)
@@ -73,7 +73,7 @@
 		load_settings
 		if is_running; then
 			log_daemon_msg "Stopping $DESC"
-			start-stop-daemon --quiet --stop --signal 15 --retry 30 --exec $PYTHONEXEC --name $NAME --user $USER
+			start-stop-daemon --quiet --stop --signal TERM --retry 30 --exec $PYTHONEXEC --name $NAME --user $USER
 			check_retval
 		else
 			log_success_msg "$DESC: not running"
@@ -81,8 +81,7 @@
 		[ -f $PIDFILE ] && rm -f $PIDFILE
 	;;
 	force-reload|restart)
-		$0 stop
-		$0 start
+		$0 stop && $0 start
 	;;
 	*)
 		log_failure_msg "Usage: $0 {start|stop|restart|force-reload}"