diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-11-10 16:37:53 -0800 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-11-10 16:37:53 -0800 |
commit | 4949cfd21cb97b17006d82f2f192ec9d01b0d1ee (patch) | |
tree | 0fbc4c4d58cfb2906a999f92a98ee51150c88dae | |
parent | 992ed8ffa8a716463be6a3520eb908cd12ca2048 (diff) |
Fix breaking out of .each loop
And some other small formatting fixes that don't belong in this patch.
-rw-r--r-- | lib/puppet/parser/functions/has_interface_with.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/puppet/parser/functions/has_interface_with.rb b/lib/puppet/parser/functions/has_interface_with.rb index 1e91026..3691524 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') @@ -55,12 +55,14 @@ has_interface_with("lo") => true 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 |