Fix breaking out of .each loop

And some other small formatting fixes that don't belong in this patch.

diff --git a/lib/puppet/parser/functions/has_interface_with.rb b/lib/puppet/parser/functions/has_interface_with.rb
index 1e91026ba97cd11150a8b1c41a73b09edc440f66..36915246d26fe6f3fada1596d6fdbb8c4e20e2b8 100644 (file)
--- 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