lib/chef/application.rb in chef-0.9.8 vs lib/chef/application.rb in chef-0.9.10.rc.0
- old
+ new
@@ -78,9 +78,11 @@
rescue Exception => error
Chef::Log.warn("*****************************************")
Chef::Log.warn("Can not find config file: #{config[:config_file]}, using defaults.")
Chef::Log.warn("#{error.message}")
Chef::Log.warn("*****************************************")
+
+ Chef::Config.merge!(config)
end
end
# Initialize and configure the logger