opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Catch :undefined_variable thrown when Future Parser is enabled with 3.7.x

Browse source
This commit is contained in:
Travis Fields 2014-10-30 23:37:00 -07:00 committed by Hunter Haugen
parent d8b86fdcc2
commit c52e262a17
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/puppet/parser/functions/has_interface_with.rb
View file

@ -35,7 +35,13 @@ has_interface_with("lo") => true
kind, value = args
if lookupvar(kind) == value
# Bug with 3.7.1 - 3.7.3 when using future parser throws :undefined_variable
# https://tickets.puppetlabs.com/browse/PUP-3597
factval = nil
catch :undefined_variable do
factval = lookupvar(kind)
end
if factval == value
return true
end
@ -44,15 +50,17 @@ has_interface_with("lo") => true
iface.downcase!
factval = nil
begin
# Bug with 3.7.1 - 3.7.3 when using future parser throws :undefined_variable
# https://tickets.puppetlabs.com/browse/PUP-3597
catch :undefined_variable do
factval = lookupvar("#{kind}_#{iface}")
rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
end
if value == factval
result = true
break
end
rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
end
end
result
end
end