diff options
Diffstat (limited to 'lib/puppet/parameter/value_collection.rb')
| -rw-r--r-- | lib/puppet/parameter/value_collection.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/puppet/parameter/value_collection.rb b/lib/puppet/parameter/value_collection.rb index 840b892f1..eabeb30f1 100644 --- a/lib/puppet/parameter/value_collection.rb +++ b/lib/puppet/parameter/value_collection.rb @@ -28,9 +28,7 @@ class Puppet::Parameter::ValueCollection end.join(", ") + "." end - unless regexes.empty? - @doc += " Values can match ``" + regexes.join("``, ``") + "``." - end + @doc += " Values can match ``" + regexes.join("``, ``") + "``." unless regexes.empty? end @doc @@ -104,9 +102,7 @@ class Puppet::Parameter::ValueCollection value.call = options[:call] || :none end - if block_given? and ! value.regex? - value.method ||= "set_#{value.name}" - end + value.method ||= "set_#{value.name}" if block_given? and ! value.regex? value end @@ -127,13 +123,9 @@ class Puppet::Parameter::ValueCollection unless @values.detect { |name, v| v.match?(value) } str = "Invalid value #{value.inspect}. " - unless values.empty? - str += "Valid values are #{values.join(", ")}. " - end + str += "Valid values are #{values.join(", ")}. " unless values.empty? - unless regexes.empty? - str += "Valid values match #{regexes.join(", ")}." - end + str += "Valid values match #{regexes.join(", ")}." unless regexes.empty? raise ArgumentError, str end |