summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-05-12 18:32:39 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit342298c4f9fcb2874d4017219a472ddf37dbfc6b (patch)
tree88ce4cf98d858a595498825a60316c8de1178f87 /lib/puppet
parent6d5566a715c0b757480b1d321d5801b795470552 (diff)
downloadpuppet-342298c4f9fcb2874d4017219a472ddf37dbfc6b.tar.gz
puppet-342298c4f9fcb2874d4017219a472ddf37dbfc6b.tar.xz
puppet-342298c4f9fcb2874d4017219a472ddf37dbfc6b.zip
Bug: Broken codepath in util/settings
An incorrect variable name is used in an error message, causing the error to throw an error. This can't appear in the wild, since it's actually just an argument check for the defaults.rb file. Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 4d5acbe5c..ea18d22bf 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -386,7 +386,7 @@ class Puppet::Util::Settings
when String, Integer, Float # nothing
klass = Setting
else
- raise Puppet::Error, "Invalid value '%s' for %s" % [value.inspect, hash[:name]]
+ raise ArgumentError, "Invalid value '%s' for %s" % [hash[:default].inspect, hash[:name]]
end
end
hash[:settings] = self