Merge lp:~zulcss/ubuntu/jaunty/nut/sru-416812 into lp:ubuntu/jaunty/nut

[Chuck Short]

[Steve Beattie (sbeattie)]

One minor nit: I think the SRU version should be 2.4.1-2ubuntu4.1 rather than 2.4.1-2ubuntu5, but in this case I believe it's okay given that based on https://launchpad.net/ubuntu/+source/nut/+changelog, it doesn't appear that there was a 2.4.1-2ubuntu5 in the karmic dev cycle.

Otherwise, fix looks good.

review: Approve (sru)

[Steve Beattie (sbeattie)]

One other comment: please update the bug report description(s) with the justification and testcase/steps to reproduce rather than just adding a comment; in particularly comment heavy bugs, in can be hard to dig those out (it also makes it more difficult to write scripts to tease out relevant information about SRUs). Thanks!

[lp:~zulcss/ubuntu/jaunty/nut/sru-416812]

38. By Chuck Short on 2009-11-09

Fix debian/changelog

Unmerged revisions

38. By Chuck Short on 2009-11-09

Fix debian/changelog

37. By Chuck Short on 2009-10-01

debian/init: Fix status_of_proc messages not to lie to the user
(LP: #416182)

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-09 14:01:54 +0000
+++ debian/changelog	2009-11-09 14:08:11 +0000
@@ -1,3 +1,10 @@
+nut (2.4.1-2ubuntu4.1) jaunty-proposed; urgency=low
+
+  * debian/init: Fix status_of_proc messages not to lie to the user
+    (LP: #416182)
+
+ -- Chuck Short <[e-mail]>  Thu, 01 Oct 2009 10:19:02 -0400
+
 nut (2.4.1-2ubuntu4) jaunty; urgency=low
 
   * debian/nut.links: must create the init script link, used if the ups

=== modified file 'debian/nut.init'
--- debian/nut.init	2009-02-27 12:49:24 +0000
+++ debian/nut.init	2009-11-09 14:08:11 +0000
@@ -65,11 +65,11 @@
 check_status() {
   case "$MODE" in
     standalone|netserver)
-      status_of_proc "$DESC" upsd
-      status_of_proc "$DESC" upsmon
+      status_of_proc -p $upsd_pid $upsd upsd
+      status_of_proc -p $upsmon_pid $upsmon upsmon
       ;;
     netclient)
-      status_of_proc "$DESC" upsmon
+      status_of_proc -p $upsmon_pid $upsmon upsmon
       ;;
     none|*)
       ;;