Fix launchd service provider to work with OX S 10.7 (Lion)

lib/puppet/provider/package/appdmg.rb

@@ -56,7 +56,7 @@ def self.installpkgdmg(source, name)
     require 'facter/util/plist'
     cached_source = source
     if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
-      cached_source = "/tmp/#{name}"
+      cached_source = "/tmp/#{name}.dmg"
       begin
         curl "-o", cached_source, "-C", "-", "-k", "-s", "--url", source
         Puppet.debug "Success: curl transfered [#{name}]"

lib/puppet/provider/package/macports.rb

@@ -21,7 +21,7 @@
 
 
   def self.parse_installed_query_line(line)
-    regex = /(\S+)\s+@(\S+)_(\S+)\s+\(active\)/
+    regex = /(\S+)\s+@(\S+)_(\d+).*\(active\)/
     fields = [:name, :ensure, :revision]
     hash_from_line(line, regex, fields)
   end
@@ -66,14 +66,20 @@ def install
   end
 
   def query
-    return self.class.parse_installed_query_line(port("-q", :installed, @resource[:name]))
+    result = self.class.parse_installed_query_line(self.class.stripWarnings port("-q", :installed, @resource[:name]))
+    return {} if result.nil?
+    return result
+  end
+
+  def self.stripWarnings(output)
+       return output.gsub(/^Warning:.*$/, "").strip
   end
 
   def latest
     # We need both the version and the revision to be confident
     # we've got the latest revision of a specific version
     # Note we're still not doing anything with variants here.
-    info_line = port("-q", :info, "--line", "--version", "--revision", @resource[:name])
+    info_line = self.class.stripWarnings port("-q", :info, "--line", "--version", "--revision", @resource[:name])
     return nil if info_line == ""
 
     if newest = self.class.parse_info_query_line(info_line)

lib/puppet/provider/package/pkgdmg.rb

@@ -60,7 +60,12 @@ def self.installpkgdmg(source, name)
     require 'open-uri'
     cached_source = source
     if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
-      cached_source = "/tmp/#{name}"
+      if source =~ /\.dmg$/i
+        ext = ".dmg"
+      else
+        ext = ".pkg"
+      end 
+      cached_source = "/tmp/#{name}#{ext}"
       begin
         curl "-o", cached_source, "-C", "-", "-k", "-s", "--url", source
         Puppet.debug "Success: curl transfered [#{name}]"

lib/puppet/provider/service/launchd.rb

@@ -121,6 +121,9 @@ def self.get_macosx_version_major
     end
   end
 
+  def self.has_launchd_overrides?
+  	return (self.get_macosx_version_major == "10.6" || self.get_macosx_version_major == "10.7")
+  end
 
   # finds the path for a given label and returns the path and parsed plist
   # as an array of [path, plist]. Note plist is really a Hash here.
@@ -211,7 +214,7 @@ def enabled?
     job_path, job_plist = plist_from_label(resource[:name])
     job_plist_disabled = job_plist["Disabled"] if job_plist.has_key?("Disabled")
 
-    if self.class.get_macosx_version_major == "10.6"
+    if self.class.has_launchd_overrides?
       if FileTest.file?(Launchd_Overrides) and overrides = self.class.read_plist(Launchd_Overrides)
         if overrides.has_key?(resource[:name])
           overrides_disabled = overrides[resource[:name]]["Disabled"] if overrides[resource[:name]].has_key?("Disabled")
@@ -236,7 +239,7 @@ def enabled?
   # In 10.6 we need to write out a disabled key to the global overrides plist, in earlier
   # versions this is stored in the job plist itself.
   def enable
-    if self.class.get_macosx_version_major == "10.6"
+    if self.class.has_launchd_overrides?
       overrides = self.class.read_plist(Launchd_Overrides)
       overrides[resource[:name]] = { "Disabled" => false }
       Plist::Emit.save_plist(overrides, Launchd_Overrides)
@@ -251,7 +254,7 @@ def enable
 
 
   def disable
-    if self.class.get_macosx_version_major == "10.6"
+    if self.class.has_launchd_overrides?
       overrides = self.class.read_plist(Launchd_Overrides)
       overrides[resource[:name]] = { "Disabled" => true }
       Plist::Emit.save_plist(overrides, Launchd_Overrides)