From 0a0fcafa3e2405aa18ecc62d1e6dc69bbd9883a1 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Thu, 17 Jul 2008 11:05:01 +1000
Subject: Fixed #1414 - Return code from waitpid now right shifted 8 bits

---
 CHANGELOG          | 2 ++
 lib/puppet/util.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8903c9e58..9af050dd2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.5
+    Fixed #1414 - Return code from waitpid now right shifted 8 bits
+
     Fixed #174 - a native type type for managing ssh authorized_keys 
     files is available.
 
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index 560afe10b..94c96db0c 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -313,7 +313,7 @@ module Util
         $VERBOSE = oldverb
         if child_pid
             # Parent process executes this
-            child_status = Process.waitpid2(child_pid)[1]
+            child_status = (Process.waitpid2(child_pid)[1]).to_i >> 8
         else
             # Child process executes this
             Process.setsid
-- 
cgit