From 422dea05e755f0026c7786b46a7e93624da1ac0a Mon Sep 17 00:00:00 2001
From: Andrew Shafer <andrew@reductivelabs.com>
Date: Mon, 16 Jun 2008 02:05:38 -0600
Subject: 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
---
 bin/puppetca | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin/puppetca')

diff --git a/bin/puppetca b/bin/puppetca
index 759b602ac..9d88a564e 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -171,8 +171,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
     ca = Puppet::SSLCertificates::CA.new()
-- 
cgit