summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-02-19 12:53:07 -0600
committerLuke Kanies <luke@madstop.com>2009-02-19 17:51:21 -0600
commitd7864bedafcca07806f6da3e3f472dc80d3206b7 (patch)
treec08bd68f6e758e00a289854d59e28c4f70e67ccc /lib/puppet
parentbd8d09747fd6c0dce89c17da41eb67ad92823cf7 (diff)
downloadpuppet-d7864bedafcca07806f6da3e3f472dc80d3206b7.tar.gz
puppet-d7864bedafcca07806f6da3e3f472dc80d3206b7.tar.xz
puppet-d7864bedafcca07806f6da3e3f472dc80d3206b7.zip
Relying on 'should_parse_config' in the 'puppet' application
There was some redundancy here, as the app was marked as needing to parse the config, but then the setup hook manually parsed it. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/application/puppet.rb5
1 files changed, 0 insertions, 5 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