Merge lp:~kirkland/upstart/no-scold into lp:ubuntu/raring/upstart

[Dustin Kirkland ]

Unmerged revisions

1423. By Dustin Kirkland  on 2013-02-15

* debian/upstart-job:
  - there's really no need to scold users when they use /etc/init.d/*
    to start/stop/restart/status services

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-22 15:54:03 +0000
+++ debian/changelog	2013-02-15 20:48:25 +0000
@@ -1,3 +1,12 @@
+upstart (1.6.1-1ubuntu3) UNRELEASED; urgency=low
+
+  [ Dustin Kirkland ]
+  * debian/upstart-job:
+    - there's really no need to scold users when they use /etc/init.d/*
+      to start/stop/restart/status services
+
+ -- Dustin Kirkland <[e-mail]>  Fri, 15 Feb 2013 14:39:00 -0600
+
 upstart (1.6.1-1ubuntu2) raring; urgency=low
 
   [ Stéphane Graber ]

=== modified file 'debian/upstart-job'
--- debian/upstart-job	2012-11-26 10:38:23 +0000
+++ debian/upstart-job	2013-02-15 20:48:25 +0000
@@ -38,9 +38,6 @@
 	ECHO_ERROR=:
 fi
 
-$ECHO "Rather than invoking init scripts through /etc/init.d, use the service(8)"
-$ECHO "utility, e.g. service $INITSCRIPT $COMMAND"
-
 # Only check if jobs are disabled if the currently _running_ version of
 # Upstart (which may be older than the latest _installed_ version)
 # supports such a query.
@@ -64,15 +61,9 @@
 
 case $COMMAND in
 status)
-    $ECHO
-    $ECHO "Since the script you are attempting to invoke has been converted to an"
-    $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB"
     $COMMAND "$JOB"
     ;;
 start|stop)
-    $ECHO
-    $ECHO "Since the script you are attempting to invoke has been converted to an"
-    $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB"
     if status "$JOB" 2>/dev/null | grep -q ' start/'; then
         RUNNING=1
     fi
@@ -86,10 +77,6 @@
     $COMMAND "$JOB"
     ;;
 restart)
-    $ECHO
-    $ECHO "Since the script you are attempting to invoke has been converted to an"
-    $ECHO "Upstart job, you may also use the stop(8) and then start(8) utilities,"
-    $ECHO "e.g. stop $JOB ; start $JOB. The restart(8) utility is also available."
     if status "$JOB" 2>/dev/null | grep -q ' start/'; then
         RUNNING=1
     fi
@@ -106,9 +93,6 @@
     start "$JOB"
     ;;
 reload|force-reload)
-    $ECHO
-    $ECHO "Since the script you are attempting to invoke has been converted to an"
-    $ECHO "Upstart job, you may also use the reload(8) utility, e.g. reload $JOB"
     reload "$JOB"
     ;;
 *)