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

2 files changed, 8 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) {
diff --git a/test/types/exec.rb b/test/types/exec.rb
index 730562a95..adc50054a 100755
--- a/test/types/exec.rb
+++ b/test/types/exec.rb
@@ -473,6 +473,7 @@ class TestExec < Test::Unit::TestCase
         # Throw a check in there with our cwd and make sure it works
         assert_nothing_raised("Could not check with a missing cwd") do
             exec2[:unless] = "test -f /this/file/does/not/exist"
+            exec2.retrieve
         end
 
         assert_raise(Puppet::Error) do