From c52e262a17d9defbd59bfed4761ab887d9e7840d Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Thu, 30 Oct 2014 23:37:00 -0700
Subject: Catch :undefined_variable thrown when Future Parser is enabled with
 3.7.x

---
 lib/puppet/parser/functions/has_interface_with.rb | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.3


From 4949cfd21cb97b17006d82f2f192ec9d01b0d1ee Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 10 Nov 2014 16:37:53 -0800
Subject: Fix breaking out of .each loop

And some other small formatting fixes that don't belong in this patch.
---
 lib/puppet/parser/functions/has_interface_with.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.3