diff options
| author | Andrew Shafer <andrew@reductivelabs.com> | 2008-06-16 02:05:38 -0600 |
|---|---|---|
| committer | Andrew Shafer <andrew@reductivelabs.com> | 2008-06-16 02:07:24 -0600 |
| commit | 422dea05e755f0026c7786b46a7e93624da1ac0a (patch) | |
| tree | 0eeae0da5329071f5bad1059a2d32b8ad4a8a242 /bin/puppetd | |
| parent | 5273b22b4fda6f9aa7a8366a1dfbae092594d391 (diff) | |
| download | puppet-422dea05e755f0026c7786b46a7e93624da1ac0a.tar.gz puppet-422dea05e755f0026c7786b46a7e93624da1ac0a.tar.xz puppet-422dea05e755f0026c7786b46a7e93624da1ac0a.zip | |
issue 1183
Added environment awareness to --configprint
Pulled the logic for --configprint --genconfig and --genmanifest out of puppet.rb
Put the logic in lib/puppet/util/settings.rb and refactored it a bit
Added specs for the behavior
Reformated the whole spec file to use nested describe
Added the new method to the executables
The old behavior should be preserved, except for the env is now used
Diffstat (limited to 'bin/puppetd')
| -rwxr-xr-x | bin/puppetd | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/puppetd b/bin/puppetd index 2a71c3a8d..0813745cc 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -299,8 +299,9 @@ unless options[:setdest] Puppet::Util::Log.newdestination(:syslog) end -Puppet.genconfig -Puppet.genmanifest +if Puppet.settings.print_configs? + exit(Puppet.settings.print_configs ? 0 : 1) +end # If noop is set, then also enable diffs if Puppet[:noop] |