diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-05-10 22:10:48 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-05-10 22:10:48 +0000 |
| commit | ca2b9e64e76d43380a5e03a87599de1d791a48ce (patch) | |
| tree | 5e979ae7d908fae6dbd8652c961a468c1efd2e81 | |
| parent | eca5510b293ec83169aae10518c11660886286d1 (diff) | |
| download | puppet-ca2b9e64e76d43380a5e03a87599de1d791a48ce.tar.gz puppet-ca2b9e64e76d43380a5e03a87599de1d791a48ce.tar.xz puppet-ca2b9e64e76d43380a5e03a87599de1d791a48ce.zip | |
Not parsing old versions of puppet.conf -- otherwise, puppet parses the whole configuration.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2504 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | lib/puppet.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index 48536c4bd..527061d9d 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -200,7 +200,7 @@ module Puppet def self.parse_config(oldconfig = nil) # First look for the old configuration file. oldconfig ||= File.join(Puppet[:confdir], Puppet[:name].to_s + ".conf") - if FileTest.exists?(oldconfig) + if FileTest.exists?(oldconfig) and Puppet[:name] != "puppet" Puppet.warning "Individual config files are deprecated; remove %s and use puppet.conf" % oldconfig Puppet.config.old_parse(oldconfig) return |