client.rb in chef-0.10.0.beta.7

- old
+ new

@@ -150,11 +150,11 @@
       build_node
 
       begin
 
         run_status.start_clock
-        Chef::Log.info("Starting Run for #{node.name}")
+        Chef::Log.info("Starting Chef Run for #{node.name}")
         run_started
 
         run_context = setup_run_context
         converge(run_context)
         save_updated_node
@@ -259,11 +259,11 @@
       # Array of Strings of the form
       #   "#{NAME}@#{VERSION}"
       @expanded_run_list_with_versions = @run_list_expansion.recipes.with_version_constraints_strings
 
       Chef::Log.info("Run List is [#{@node.run_list}]")
-      Chef::Log.info("Run List expands (with versions) to [#{@expanded_run_list_with_versions.join(', ')}]")
+      Chef::Log.info("Run List expands to [#{@expanded_run_list_with_versions.join(', ')}]")
 
       @run_status = Chef::RunStatus.new(@node)
 
       @node
     end
@@ -315,12 +315,14 @@
     def enforce_path_sanity(env=ENV)
       if Chef::Config[:enforce_path_sanity] && RUBY_PLATFORM !~ /mswin|mingw32|windows/
         existing_paths = env["PATH"].split(':')
         SANE_PATHS.each do |sane_path|
           unless existing_paths.include?(sane_path)
-            env["PATH"] << ':' unless env["PATH"].empty?
-            env["PATH"] << sane_path
+            env_path = env["PATH"].dup
+            env_path << ':' unless env["PATH"].empty?
+            env_path << sane_path
+            env["PATH"] = env_path
           end
         end
       end
     end
 
@@ -337,10 +339,10 @@
     def assert_cookbook_path_not_empty(run_context)
       if Chef::Config[:solo]
         # Check for cookbooks in the path given
         # Chef::Config[:cookbook_path] can be a string or an array
         # if it's an array, go through it and check each one, raise error at the last one if no files are found
-        Chef::Log.debug "loading from cookbook_path: #{Array(Chef::Config[:cookbook_path]).map { |path| File.expand_path(path) }.join(', ')}"
+        Chef::Log.debug "Loading from cookbook_path: #{Array(Chef::Config[:cookbook_path]).map { |path| File.expand_path(path) }.join(', ')}"
         Array(Chef::Config[:cookbook_path]).each_with_index do |cookbook_path, index|
           if directory_not_empty?(cookbook_path)
             break
           else
             msg = "No cookbook found in #{Chef::Config[:cookbook_path].inspect}, make sure cookbook_path is set correctly."