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

Proposed by Dustin Kirkland  on 2013-02-15
Status: Needs review
Proposed branch: lp:~kirkland/upstart/no-scold
Merge into: lp:ubuntu/raring/upstart
Diff against target: 67 lines (+9/-16)
2 files modified
debian/changelog (+9/-0)
debian/upstart-job (+0/-16)
To merge this branch: bzr merge lp:~kirkland/upstart/no-scold
Reviewer Review Type Date Requested Status
James Hunt 2013-02-15 Pending
Review via email: mp+148816@code.launchpad.net
To post a comment you must log in.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-01-22 15:54:03 +0000
3+++ debian/changelog 2013-02-15 20:48:25 +0000
4@@ -1,3 +1,12 @@
5+upstart (1.6.1-1ubuntu3) UNRELEASED; urgency=low
6+
7+ [ Dustin Kirkland ]
8+ * debian/upstart-job:
9+ - there's really no need to scold users when they use /etc/init.d/*
10+ to start/stop/restart/status services
11+
12+ -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 15 Feb 2013 14:39:00 -0600
13+
14 upstart (1.6.1-1ubuntu2) raring; urgency=low
15
16 [ Stéphane Graber ]
17
18=== modified file 'debian/upstart-job'
19--- debian/upstart-job 2012-11-26 10:38:23 +0000
20+++ debian/upstart-job 2013-02-15 20:48:25 +0000
21@@ -38,9 +38,6 @@
22 ECHO_ERROR=:
23 fi
24
25-$ECHO "Rather than invoking init scripts through /etc/init.d, use the service(8)"
26-$ECHO "utility, e.g. service $INITSCRIPT $COMMAND"
27-
28 # Only check if jobs are disabled if the currently _running_ version of
29 # Upstart (which may be older than the latest _installed_ version)
30 # supports such a query.
31@@ -64,15 +61,9 @@
32
33 case $COMMAND in
34 status)
35- $ECHO
36- $ECHO "Since the script you are attempting to invoke has been converted to an"
37- $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB"
38 $COMMAND "$JOB"
39 ;;
40 start|stop)
41- $ECHO
42- $ECHO "Since the script you are attempting to invoke has been converted to an"
43- $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB"
44 if status "$JOB" 2>/dev/null | grep -q ' start/'; then
45 RUNNING=1
46 fi
47@@ -86,10 +77,6 @@
48 $COMMAND "$JOB"
49 ;;
50 restart)
51- $ECHO
52- $ECHO "Since the script you are attempting to invoke has been converted to an"
53- $ECHO "Upstart job, you may also use the stop(8) and then start(8) utilities,"
54- $ECHO "e.g. stop $JOB ; start $JOB. The restart(8) utility is also available."
55 if status "$JOB" 2>/dev/null | grep -q ' start/'; then
56 RUNNING=1
57 fi
58@@ -106,9 +93,6 @@
59 start "$JOB"
60 ;;
61 reload|force-reload)
62- $ECHO
63- $ECHO "Since the script you are attempting to invoke has been converted to an"
64- $ECHO "Upstart job, you may also use the reload(8) utility, e.g. reload $JOB"
65 reload "$JOB"
66 ;;
67 *)

Subscribers

People subscribed via source and target branches