[Pkg-puppet-devel] Bug#573473: puppetmaster and puppet scripts always return 0

[Mathias Gug]

Package: puppet
Version: 0.25.4-2
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu lucid ubuntu-patch



*** /tmp/tmpTCsRse
In Ubuntu, we've applied the attached patch to achieve the following:

  [ Angel Abad ]
  * Fix return codes puppetmaster.init and puppet.init (LP: #527860)

We thought you might be interested in doing the same. 


-- System Information:
Debian Release: squeeze/sid
  APT prefers lucid-updates
  APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-25-server (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
=== modified file 'debian/puppet.init'
--- debian/puppet.init	2010-02-01 12:31:58 +0000
+++ debian/puppet.init	2010-03-11 17:22:13 +0000
@@ -55,17 +55,17 @@
     start)
 	log_begin_msg "Starting $DESC"
 	start_puppet
-	log_end_msg 0
+	log_end_msg $?
 	;;
     stop)
 	log_begin_msg "Stopping $DESC"
 	stop_puppet
-	log_end_msg 0
+	log_end_msg $?
 	;;
     reload)
     	log_begin_msg "Reloading $DESC"
     	reload_puppet
-    	log_end_msg 0
+    	log_end_msg $?
     	;;
     status)
 	status_puppet
@@ -75,12 +75,10 @@
 	stop_puppet
 	sleep 1
 	start_puppet
-	log_end_msg 0
+	log_end_msg $?
 	;;
   *)
 	echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" >&2
 	exit 1
 	;;
 esac
-
-exit 0

=== modified file 'debian/puppetmaster.init'
--- debian/puppetmaster.init	2010-02-01 12:31:58 +0000
+++ debian/puppetmaster.init	2010-03-11 17:22:13 +0000
@@ -116,12 +116,10 @@
 	stop_puppetmaster
 	sleep 1
 	start_puppetmaster
-	log_end_msg 0
+	log_end_msg $?
 	;;
     *)
 	echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2
 	exit 1
 	;;
 esac
-
-exit 0