[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.1-1-69-gb75a307

[James Turnbull]

The following commit has been merged in the master branch:
commit 76ac1f88ce2a13cabbda38eb56ed21a43e6923a7
Author: donavan <donavan at desinc.net>
Date:   Wed Oct 27 17:57:03 2010 -0700

    Fixed #5112 - Launchd Service broke in 2.6.2 with OS X 10.4 Clients.
    
    Just to follow up on 5112 I have a dirty patch that appears to work.
    Nominally tested it on 10.4, 10.5, & 10.6. 10.4 now applies catalogs
    instead of failing. All versions successfully manage a test services
    state as well.
    
    Does anyone have a better suggestion than '-o /dev/stdout'? Seems a
    mite hacky to me.
    
    Also I think that the 10.4 machines are going to a have a \ ( slash )
    file in whatever puppets working dir was. plutil seems to have been
    interpreting as literal file name.

diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb
index b296e0a..1632eda 100644
--- a/lib/puppet/provider/service/launchd.rb
+++ b/lib/puppet/provider/service/launchd.rb
@@ -56,7 +56,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # Read a plist, whether its format is XML or in Apple's "binary1"
   # format.
   def self.read_plist(path)
-    Plist::parse_xml(plutil('-convert', 'xml1', '-o', '-', path))
+    Plist::parse_xml(plutil('-convert', 'xml1', '-o', '/dev/stdout', path))
   end
 
   # returns a label => path map for either all jobs, or just a single

-- 
Puppet packaging for Debian