]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '4.3.x'
authorTravis Fields <travis@puppetlabs.com>
Fri, 24 Oct 2014 21:30:01 +0000 (14:30 -0700)
committerTravis Fields <travis@puppetlabs.com>
Fri, 24 Oct 2014 21:30:01 +0000 (14:30 -0700)
Conflicts:
README.markdown
lib/puppet/parser/functions/has_interface_with.rb

1  2 
lib/puppet/parser/functions/has_interface_with.rb

index 10ad5427ce8b19115655c771eec88f0983da9dd8,d5dbe473f6c33ae1e8479252275688274973fb6b..00e405d13c61b37b9bcdfc2c078c0947015734d7
@@@ -41,12 -42,8 +41,13 @@@ has_interface_with("lo"
  
      result = false
      interfaces.each do |iface|
 -      if value == lookupvar("#{kind}_#{iface}")
+       iface.downcase!
 +      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