Merge branch '4.3.x'

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

CHANGELOG.md

@@ -1,3 +1,9 @@
+##2014-07-15 - Supported Release 4.3.2
+###Summary
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
 ##2014-07-14 - Supported Release 4.3.1
 ### Summary
 This supported release updates the metadata.json to work around upgrade behavior of the PMT.

lib/puppet/parser/functions/has_interface_with.rb

@@ -41,6 +41,7 @@ module Puppet::Parser::Functions
 
     result = false
     interfaces.each do |iface|
+      iface.downcase!
       factval = nil
       begin
         factval = lookupvar("#{kind}_#{iface}")

lib/puppet/provider/file_line/ruby.rb

@@ -34,7 +34,7 @@ def lines
 
   def handle_create_with_match()
     regex = resource[:match] ? Regexp.new(resource[:match]) : nil
-    match_count = lines.select { |l| regex.match(l) }.size
+    match_count = count_matches(regex)
     if match_count > 1 && resource[:multiple].to_s != 'true'
      raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
     end
@@ -51,9 +51,7 @@ def handle_create_with_match()
 
   def handle_create_with_after
     regex = Regexp.new(resource[:after])
-
-    count = lines.count {|l| l.match(regex)}
-
+    count = count_matches(regex)
     case count
     when 1 # find the line to put our line after
       File.open(resource[:path], 'w') do |fh|
@@ -71,6 +69,10 @@ def handle_create_with_after
     end
   end
 
+  def count_matches(regex)
+    lines.select{|l| l.match(regex)}.size
+  end
+
   ##
   # append the line to the file.
   #

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-stdlib",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "author": "puppetlabs",
   "summary": "Puppet Module Standard Library",
   "license": "Apache 2.0",