From: Travis Fields <travis@puppetlabs.com>
Date: Fri, 24 Oct 2014 21:30:01 +0000 (-0700)
Subject: Merge branch '4.3.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f0b207c03587f5c92915f86051dc139b939c53c0;p=puppet-stdlib.git

Merge branch '4.3.x'

Conflicts:
	README.markdown
	lib/puppet/parser/functions/has_interface_with.rb
---

f0b207c03587f5c92915f86051dc139b939c53c0
diff --cc lib/puppet/parser/functions/has_interface_with.rb
index 10ad542,d5dbe47..00e405d
--- a/lib/puppet/parser/functions/has_interface_with.rb
+++ b/lib/puppet/parser/functions/has_interface_with.rb
@@@ -41,12 -42,8 +41,13 @@@ has_interface_with("lo"
  
      result = false
      interfaces.each do |iface|
+       iface.downcase!
 -      if value == lookupvar("#{kind}_#{iface}")
 +      factval = nil
 +      begin
 +        factval = lookupvar("#{kind}_#{iface}")
 +      rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
 +      end
 +      if value == factval
          result = true
          break
        end