diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-04-05 21:04:12 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-04-05 21:04:12 +0000 |
| commit | 37a4a555429e195079ee6d301948c75b85048996 (patch) | |
| tree | 75dbb14f21a38a66399153f32d851c8ed08d2756 /lib | |
| parent | 4ab74ce60963eb543c5e2aa4bb3bd696bf2a5438 (diff) | |
| download | puppet-37a4a555429e195079ee6d301948c75b85048996.tar.gz puppet-37a4a555429e195079ee6d301948c75b85048996.tar.xz puppet-37a4a555429e195079ee6d301948c75b85048996.zip | |
And, one more time. My test for the last bug did not actually retrieve, so it did not enounter the problem, and i had also forgotten to add the "check" boolean to the checks. Hopefully this will be the end of exec bugs for the day.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1088 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/puppet/type/exec.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb index 6c15e1c7f..0378e78ba 100755 --- a/lib/puppet/type/exec.rb +++ b/lib/puppet/type/exec.rb @@ -347,7 +347,7 @@ module Puppet # Return true if the command does not return 0. def check - output, status = @parent.run(self.value) + output, status = @parent.run(self.value, true) return status.exitstatus != 0 end @@ -374,7 +374,7 @@ module Puppet # Return true if the command returns 0. def check - output, status = @parent.run(self.value) + output, status = @parent.run(self.value, true) return status.exitstatus == 0 end @@ -462,7 +462,11 @@ module Puppet dir ||= Dir.pwd - debug "Executing '#{command}'" + if check + debug "Executing check '#{command}'" + else + debug "Executing '#{command}'" + end begin # Do our chdir Dir.chdir(dir) { |