diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-09 15:11:36 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-09 15:11:36 -0800 |
| commit | 80adb39d1f4e87fe2fa12bd03df335fc285c0bb6 (patch) | |
| tree | 4be8f5688fc6d6dedf433ad375745a54640d0a3b /lib/puppet/provider | |
| parent | 2279fe12b32bd626066d9b7637367fcbb293c29b (diff) | |
| parent | 244213c856f3753dd3e06c5f01003f6a0d3f77ef (diff) | |
| download | puppet-80adb39d1f4e87fe2fa12bd03df335fc285c0bb6.tar.gz puppet-80adb39d1f4e87fe2fa12bd03df335fc285c0bb6.tar.xz puppet-80adb39d1f4e87fe2fa12bd03df335fc285c0bb6.zip | |
Merge commit '2.6.3rc2' into next
Manually resolved conflicts:
lib/puppet/parser/ast/resource.rb
spec/unit/parser/ast/resource_spec.rb
Diffstat (limited to 'lib/puppet/provider')
| -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 |