[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.25.4-2-1-g56ccbe0

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit 56ccbe01e3a74017056a1f4789e9d1f6cba5a072
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Fri Mar 12 12:19:57 2010 +0100

    Fix "puppetmaster and puppet scripts always return 0" with patch from Mathias Gug, make sure return codes are actually used (Closes: #573473)

diff --git a/debian/changelog b/debian/changelog
index 7e26a1f..b865174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+puppet (0.25.4-3) UNRELEASED; urgency=low
+
+  * Fix "puppetmaster and puppet scripts always return 0" with patch from
+    Mathias Gug, make sure return codes are actually used (Closes: #573473)
+
+ -- Stig Sandbeck Mathisen <ssm at debian.org>  Fri, 12 Mar 2010 12:18:43 +0100
+
 puppet (0.25.4-2) unstable; urgency=low
 
   [ Stig Sandbeck Mathisen ]
diff --git a/debian/puppet.init b/debian/puppet.init
index 6cbdc55..b232e59 100644
--- a/debian/puppet.init
+++ b/debian/puppet.init
@@ -55,17 +55,17 @@ case "$1" in
     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 @@ case "$1" in
 	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
diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init
index bfc1aff..1e43848 100644
--- a/debian/puppetmaster.init
+++ b/debian/puppetmaster.init
@@ -116,12 +116,10 @@ case "$1" in
 	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

-- 
Puppet packaging for Debian