diff options
Diffstat (limited to 'lib/puppet/util.rb')
| -rw-r--r-- | lib/puppet/util.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index 386100270..1f974921e 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -215,7 +215,7 @@ module Util end if failonfail - unless $? == 0 + unless $CHILD_STATUS == 0 raise ExecutionFailure, output end end @@ -380,7 +380,7 @@ module Util def memory unless defined?(@pmap) pmap = %x{which pmap 2>/dev/null}.chomp - if $? != 0 or pmap =~ /^no/ + if $CHILD_STATUS != 0 or pmap =~ /^no/ @pmap = nil else @pmap = pmap |