summaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
authorTravis Fields <travis@puppetlabs.com>2014-10-30 23:37:00 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-11-10 16:33:18 -0800
commitc52e262a17d9defbd59bfed4761ab887d9e7840d (patch)
treecc02d9cbcc0156dfc2c4c6694d2530d8c64f1498 /lib/puppet
parentd8b86fdcc2711bff15a169552641e6fec0546ccd (diff)
downloadpuppet-stdlib-c52e262a17d9defbd59bfed4761ab887d9e7840d.tar.gz
puppet-stdlib-c52e262a17d9defbd59bfed4761ab887d9e7840d.tar.bz2
Catch :undefined_variable thrown when Future Parser is enabled with 3.7.x
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/functions/has_interface_with.rb26
1 files changed, 17 insertions, 9 deletions
diff --git a/lib/puppet/parser/functions/has_interface_with.rb b/lib/puppet/parser/functions/has_interface_with.rb
index 00e405d..1e91026 100644
--- a/lib/puppet/parser/functions/has_interface_with.rb
+++ b/lib/puppet/parser/functions/has_interface_with.rb
@@ -16,11 +16,11 @@ etc.
If no "kind" is given, then the presence of the interface is checked:
has_interface_with("lo") => true
- EOS
+ EOS
) do |args|
raise(Puppet::ParseError, "has_interface_with(): Wrong number of arguments " +
- "given (#{args.size} for 1 or 2)") if args.size < 1 or args.size > 2
+ "given (#{args.size} for 1 or 2)") if args.size < 1 or args.size > 2
interfaces = lookupvar('interfaces')
@@ -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
- factval = lookupvar("#{kind}_#{iface}")
+ # 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}")
+ end
+ if value == factval
+ result = true
+ end
rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
end
- if value == factval
- result = true
- break
- end
end
-
result
end
end