diff options
author | Micah Anderson <micah@riseup.net> | 2015-01-27 15:14:18 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2015-01-27 15:14:18 -0500 |
commit | 71123634744b9fe2ec7d6a3e38e9789fd84801e3 (patch) | |
tree | 1794e812d83facd93b3007c42632c63ddf1eb2fc /lib/puppet/parser/functions/bool2num.rb | |
parent | 71cb0f4c2c3bf95f62c9f189f5cef155b09a9682 (diff) | |
parent | 5863ab3901368310186790980aea2b0bf7cecb06 (diff) |
Merge branch 'master' into leap
Diffstat (limited to 'lib/puppet/parser/functions/bool2num.rb')
-rw-r--r-- | lib/puppet/parser/functions/bool2num.rb | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/lib/puppet/parser/functions/bool2num.rb b/lib/puppet/parser/functions/bool2num.rb index 9a07a8a..6ad6cf4 100644 --- a/lib/puppet/parser/functions/bool2num.rb +++ b/lib/puppet/parser/functions/bool2num.rb @@ -14,30 +14,7 @@ module Puppet::Parser::Functions raise(Puppet::ParseError, "bool2num(): Wrong number of arguments " + "given (#{arguments.size} for 1)") if arguments.size < 1 - value = arguments[0] - klass = value.class - - # We can have either true or false, or string which resembles boolean ... - unless [FalseClass, TrueClass, String].include?(klass) - raise(Puppet::ParseError, 'bool2num(): Requires either ' + - 'boolean or string to work with') - end - - if value.is_a?(String) - # We consider all the yes, no, y, n and so on too ... - value = case value - # - # This is how undef looks like in Puppet ... - # We yield 0 (or false if you wish) in this case. - # - when /^$/, '' then false # Empty string will be false ... - when /^(1|t|y|true|yes)$/ then true - when /^(0|f|n|false|no)$/ then false - when /^(undef|undefined)$/ then false # This is not likely to happen ... - else - raise(Puppet::ParseError, 'bool2num(): Unknown type of boolean given') - end - end + value = function_str2bool([arguments[0]]) # We have real boolean values as well ... result = value ? 1 : 0 |