Fixed #1073 - moved show_diff and other logic post config parse

1 files changed, 8 insertions, 8 deletions

diff --git a/bin/puppet b/bin/puppet
index 952ffcbf8..9e1102a3d 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -136,6 +136,14 @@ end
 
 Puppet.parse_config
 
+# Now parse the config
+if Puppet[:config] and File.exists? Puppet[:config]
+    Puppet.settings.parse(Puppet[:config])
+end
+
+Puppet.genconfig
+Puppet.genmanifest
+
 # If noop is set, then also enable diffs
 if Puppet[:noop]
     Puppet[:show_diff] = true
@@ -156,14 +164,6 @@ elsif options[:verbose]
     Puppet::Util::Log.level = :info
 end
 
-# Now parse the config
-if Puppet[:config] and File.exists? Puppet[:config]
-    Puppet.settings.parse(Puppet[:config])
-end
-
-Puppet.genconfig
-Puppet.genmanifest
-
 # Set our code or file to use.
 if options[:code] or ARGV.length == 0
     Puppet[:code] = options[:code] || STDIN.read