diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-07-04 09:06:40 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-07-04 09:06:40 +1000 |
| commit | 5020938b4149566a487f02e6fa995d99daaa6b42 (patch) | |
| tree | 6c1ccf4973a511dfe16ccef7edc3229c1af43f36 | |
| parent | f462617295c6b2ae4e6d2ba3b8e73f7fc5189983 (diff) | |
| parent | 2279acdd30ef84d20be7bae6ca2c862ddc4bf959 (diff) | |
| download | puppet-5020938b4149566a487f02e6fa995d99daaa6b42.tar.gz puppet-5020938b4149566a487f02e6fa995d99daaa6b42.tar.xz puppet-5020938b4149566a487f02e6fa995d99daaa6b42.zip | |
Merge branch 'ticket/0.24.x/1391' of git://github.com/littleidea/puppet into 0.24.x
| -rwxr-xr-x | bin/filebucket | 5 | ||||
| -rwxr-xr-x | ext/module_puppet | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bin/filebucket b/bin/filebucket index 5790c9460..17e01ed64 100755 --- a/bin/filebucket +++ b/bin/filebucket @@ -163,8 +163,9 @@ end # Now parse the config Puppet.parse_config -Puppet.genconfig -Puppet.genmanifest +if Puppet.settings.print_configs? + exit(Puppet.settings.print_configs ? 0 : 1) +end begin if options[:local] or options[:bucket] 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" |