Merge branch 'master' of git@github.com:hjkp/chef

Author: Ezra Zygmuntowicz

chef/lib/chef/mixin/command.rb

@@ -37,13 +37,13 @@ def run_command(args={})
           if Proc === args[:only_if]
             res = args[:only_if].call
             unless res
-              Chef::Log.debug("Skipping #{args[:command_string]} - onlyif #{args[:only_if]}")
+              Chef::Log.debug("Skipping #{args[:command_string]} - only_if #{args[:only_if]}")
               return false
             end    
           else  
             status = popen4(args[:only_if]) { |p, i, o, e| }
             if status.exitstatus != 0
-              Chef::Log.debug("Skipping #{args[:command_string]} - onlyif #{args[:only_if]} returned #{status.exitstatus}")
+              Chef::Log.debug("Skipping #{args[:command_string]} - only_if #{args[:only_if]} returned #{status.exitstatus}")
               return false
             end
           end  
@@ -53,14 +53,14 @@ def run_command(args={})
           if Proc === args[:not_if]
             res = args[:not_if].call
             unless res
-              Chef::Log.debug("Skipping #{args[:command_string]} - onlyif #{args[:not_if]}")
+              Chef::Log.debug("Skipping #{args[:command_string]} - not_if #{args[:not_if]}")
               return false
             end    
           else
             Chef::Log.debug("I should be running '#{args[:not_if]}'")
             status = popen4(args[:not_if]) { |p, i, o, e| }
             if status.exitstatus == 0
-              Chef::Log.debug("Skipping #{args[:command_string]} - unless #{args[:not_if]} returned #{status.exitstatus}")
+              Chef::Log.debug("Skipping #{args[:command_string]} - not_if #{args[:not_if]} returned #{status.exitstatus}")
               return false
             end
           end  

chef/lib/chef/rest.rb

@@ -128,7 +128,11 @@ def run_request(method, url, data=false, limit=10, raw=false)
           response.read_body do |chunk|
             tf.write(chunk) 
             size += chunk.size
-            Chef::Log.debug("#{req.path} %d%% done (%d of %d)" % [(size * 100) / total, size, total])
+            if size == 0
+              Chef::Log.debug("#{req.path} done (0 length file)")
+            else
+              Chef::Log.debug("#{req.path} %d%% done (%d of %d)" % [(size * 100) / total, size, total])
+            end
           end
           tf.close 
           tf