Signed-off-by: Nigel Kersten <nig...@google.com>
---
lib/puppet/provider/service/launchd.rb | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/puppet/provider/service/launchd.rb
b/lib/puppet/provider/service/launchd.rb
index 8bf3a9d..64b61ff 100644
--- a/lib/puppet/provider/service/launchd.rb
+++ b/lib/puppet/provider/service/launchd.rb
@@ -108,16 +108,14 @@ Puppet::Type.type(:service).provide :launchd, :parent =>
:base do
# and check if our resource is included. The output formats differ
# between 10.4 and 10.5, thus the necessity for splitting
begin
- jobs = []
output = launchctl :list
- output.split("\n").each do |j|
- jobs << j.split(/\s/).last
+ if output.nil?
+ raise Puppet::Error.new("launchctl list failed to return any
data.")
end
- if jobs.include?(resource[:name])
- return :running
- else
- return :stopped
+ 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
--
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
-~----------~----~----~----~------~----~------~--~---
