Fix breaking out of .each loop
And some other small formatting fixes that don't belong in this patch.
This commit is contained in:
parent
992ed8ffa8
commit
4949cfd21c
1 changed files with 7 additions and 5 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue