summaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-03-18 15:38:07 -0700
committerAdrien Thebo <git@somethingsinistral.net>2013-03-18 15:38:07 -0700
commit2c1b2c07c2d09464377cbde7b21952c99877751c (patch)
tree14588238bdad3432042f0177201869f14fd8b047 /lib/puppet
parent292490b0adefa9385a1940431f15332724f1c6b4 (diff)
parentc0a0682706ccc1ed8c927c5529c08ffe2a7a4a5e (diff)
Merge branch '3.x' into 4.x
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/functions/str2bool.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/parser/functions/str2bool.rb b/lib/puppet/parser/functions/str2bool.rb
index c320da6..9ea6dd5 100644
--- a/lib/puppet/parser/functions/str2bool.rb
+++ b/lib/puppet/parser/functions/str2bool.rb
@@ -14,6 +14,11 @@ like: 0, f, n, false, no to 'false'.
"given (#{arguments.size} for 1)") if arguments.size < 1
string = arguments[0]
+
+ # If string is already Boolean, return it
+ if !!string == string
+ return string
+ end
unless string.is_a?(String)
raise(Puppet::ParseError, 'str2bool(): Requires either ' +