From 568db0b490c778ca20c6deb6fe4a3eeab71226b8 Mon Sep 17 00:00:00 2001 From: luke Date: Tue, 8 May 2007 16:13:18 +0000 Subject: Fixing configprint so it fails correctly when an invalid parameter is provided, rather than throwing a stack trace git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2483 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/puppet.rb b/lib/puppet.rb index c96f9a08e..48536c4bd 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -128,10 +128,22 @@ module Puppet end elsif val =~ /,/ val.split(/\s*,\s*/).sort.each do |v| - puts "%s = %s" % [v, Puppet[v]] + if Puppet.config.include?(v) + puts "%s = %s" % [v, Puppet[v]] + else + puts "invalid parameter: %s" % v + exit(1) + end end else - puts Puppet[val] + val.split(/\s*,\s*/).sort.each do |v| + if Puppet.config.include?(v) + puts Puppet[val] + else + puts "invalid parameter: %s" % v + exit(1) + end + end end exit(0) end -- cgit