Fixing #206 and #422. Executables will still look for the deprecated config files and load them using the old parse method, but they now prefer a single configuration file, and files can set parameters (owner, mode, group) in brackets on the same line.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2464 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 2 insertions, 0 deletions

diff --git a/bin/puppet b/bin/puppet
index 0e3ca0f0a..241bac785 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -132,6 +132,8 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
+Puppet.parse_config
+
 unless logset
     Puppet::Util::Log.newdestination(:console)
 end