diff options
| -rw-r--r-- | lib/puppet/application/puppet.rb | 5 | ||||
| -rw-r--r-- | spec/unit/application/puppet.rb | 10 |
2 files changed, 0 insertions, 15 deletions
diff --git a/lib/puppet/application/puppet.rb b/lib/puppet/application/puppet.rb index 5b4386e8c..f576f424f 100644 --- a/lib/puppet/application/puppet.rb +++ b/lib/puppet/application/puppet.rb @@ -99,11 +99,6 @@ Puppet::Application.new(:puppet) do end setup do - # Now parse the config - if Puppet[:config] and File.exists? Puppet[:config] - Puppet.settings.parse(Puppet[:config]) - end - if Puppet.settings.print_configs? exit(Puppet.settings.print_configs ? 0 : 1) end diff --git a/spec/unit/application/puppet.rb b/spec/unit/application/puppet.rb index df9aaa4e6..13b572d8f 100644 --- a/spec/unit/application/puppet.rb +++ b/spec/unit/application/puppet.rb @@ -54,16 +54,6 @@ describe "Puppet" do @puppet.options.stubs(:[]).with(any_parameters) end - it "should parse additionnal Puppet config if set to" do - Puppet.stubs(:[]).with(:noop) - Puppet.stubs(:[]).with(:config).returns("file.conf") - File.stubs(:exists?).with("file.conf").returns(true) - - Puppet.settings.expects(:parse).with("file.conf") - - @puppet.run_setup - end - it "should set show_diff on --noop" do Puppet.stubs(:[]=) Puppet.stubs(:[]).with(:config) |