summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/methodhelper.rb
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2009-10-26 23:09:07 -0700
committerJames Turnbull <james@lovedthanlost.net>2009-11-14 09:08:53 +1100
commitca56aa7e5849a5489e8d38e29b25ea934caafcd7 (patch)
treed144a73d0fcae991281f688284c09283510f965d /lib/puppet/util/methodhelper.rb
parentadc0a4ed939a717e8735485d493bde28ceab5ac0 (diff)
downloadpuppet-ca56aa7e5849a5489e8d38e29b25ea934caafcd7.tar.gz
puppet-ca56aa7e5849a5489e8d38e29b25ea934caafcd7.tar.xz
puppet-ca56aa7e5849a5489e8d38e29b25ea934caafcd7.zip
Least kludgy patch for #2675
This makes parameters responsible for the canonicalization of their values and provides a default (passthrough) implementation. It changes munge to pre- canonicalize the value and resource references to builtin types to canonicalize titles (which map to resorce namevars) with the corresponding parameter's classes's canonicalization. It adds a canonicalization routine to file paths that normalizes the behaviour (trailing slashes are ignored) and DRYs up the related code. Signed-off-by: Markus Roberts <Markus@reality.com>
Diffstat (limited to 'lib/puppet/util/methodhelper.rb')
-rw-r--r--lib/puppet/util/methodhelper.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/puppet/util/methodhelper.rb b/lib/puppet/util/methodhelper.rb
index 32fca1877..ecc9d537f 100644
--- a/lib/puppet/util/methodhelper.rb
+++ b/lib/puppet/util/methodhelper.rb
@@ -12,11 +12,10 @@ module Puppet::Util::MethodHelper
def set_options(options)
options.each do |param,value|
method = param.to_s + "="
- begin
+ if respond_to? method
self.send(method, value)
- rescue NoMethodError
- raise ArgumentError, "Invalid parameter %s to object class %s" %
- [param,self.class.to_s]
+ else
+ raise ArgumentError, "Invalid parameter #{param} to object class #{self.class}"
end
end
end