Clean up fix to launchd service provider to be more concise
Signed-off-by: Nigel Kersten <nig...@google.com>
---
lib/puppet/provider/service/launchd.rb | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/lib/puppet/provider/service/launchd.rb
b/lib/puppet/provider/service/launchd.rb
index 891c96b..64b61ff 100644
--- a/lib/puppet/provider/service/launchd.rb
+++ b/lib/puppet/provider/service/launchd.rb
@@ -103,12 +103,21 @@ Puppet::Type.type(:service).provide :launchd, :parent =>
:base do
def status
# launchctl list <jobname> exits zero if the job is loaded
- # and non-zero if it isn't. Simple way to check...
+ # and non-zero if it isn't. Simple way to check... but is only
+ # available on OS X 10.5 unfortunately, so we grab the whole list
+ # and check if our resource is included. The output formats differ
+ # between 10.4 and 10.5, thus the necessity for splitting
begin
- launchctl :list, resource[:name]
- return :running
- rescue Puppet::ExecutionFailure
+ output = launchctl :list
+ if output.nil?
+ raise Puppet::Error.new("launchctl list failed to return any
data.")
+ end
+ output.split("\n").each do |j|
+ return :running if j.split(/\s/).last == resource[:name]
+ end
return :stopped
+ rescue Puppet::ExecutionFailure
+ raise Puppet::Error.new("Unable to determine status of
#{resource[:name]}")
end
end
--
1.5.3.1
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
