summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-07-17 11:05:01 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-07-17 11:05:01 +1000
commit0a0fcafa3e2405aa18ecc62d1e6dc69bbd9883a1 (patch)
treeea2bf90adf1cc270ae6047b2be9f5fbdd20279a2 /lib/puppet
parent61b9bcd26fe39502d0de1f876a8293e54f63b1c7 (diff)
downloadpuppet-0a0fcafa3e2405aa18ecc62d1e6dc69bbd9883a1.tar.gz
puppet-0a0fcafa3e2405aa18ecc62d1e6dc69bbd9883a1.tar.xz
puppet-0a0fcafa3e2405aa18ecc62d1e6dc69bbd9883a1.zip
Fixed #1414 - Return code from waitpid now right shifted 8 bits
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util.rb2
1 files changed, 1 insertions, 1 deletions
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