diff options
| author | donavan <donavan@desinc.net> | 2010-10-27 17:57:03 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-10-29 08:37:11 +1100 |
| commit | 76ac1f88ce2a13cabbda38eb56ed21a43e6923a7 (patch) | |
| tree | fe6ff3c467662777af152a07bcd69bf4298cde52 /lib/puppet | |
| parent | 776ea2a17de7834ecdaded9fcaabc48446d2f29d (diff) | |
| download | puppet-76ac1f88ce2a13cabbda38eb56ed21a43e6923a7.tar.gz puppet-76ac1f88ce2a13cabbda38eb56ed21a43e6923a7.tar.xz puppet-76ac1f88ce2a13cabbda38eb56ed21a43e6923a7.zip | |
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.
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/provider/service/launchd.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb index b296e0a38..1632edabf 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 |