Merge branch '0.24.x'

Conflicts:

	lib/puppet/util/settings.rb
	spec/integration/defaults.rb
	spec/unit/node/catalog.rb
	spec/unit/type/interface.rb
	spec/unit/type/ssh_authorized_key.rb

1 files changed, 3 insertions, 2 deletions

diff --git a/ext/module_puppet b/ext/module_puppet
index e4a680e1b..978d660cc 100755
--- a/ext/module_puppet
+++ b/ext/module_puppet
@@ -138,8 +138,9 @@ server = nil
     end
 end
 
-Puppet.genconfig
-Puppet.genmanifest
+if Puppet.settings.print_configs?
+        exit(Puppet.settings.print_configs ? 0 : 1)
+end
 
 unless ARGV.length > 0
     $stderr.puts "You must pass a script to parse"