lib/chef/shef.rb in chef-0.8.14 vs lib/chef/shef.rb in chef-0.8.16

- old
+ new

@@ -197,9 +197,12 @@ self.new.parse_opts end def parse_opts parse_options + # We have to nuke ARGV to make sure irb's option parser never sees it. + # otherwise, IRB complains about command line switches it doesn't recognize. + ARGV.clear config[:config_file] = config_file_for_shef_mode config_msg = config[:config_file] || "none (standalone shef session)" puts "loading configuration: #{config_msg}" Chef::Config.from_file(config[:config_file]) if !config[:config_file].nil? && File.exists?(config[:config_file]) && File.readable?(config[:config_file]) Chef::Config.merge!(config) \ No newline at end of file