summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Danna <steve@opscode.com>2012-09-03 11:26:57 -0700
committerSteven Danna <steve@opscode.com>2012-09-03 11:26:57 -0700
commitfed81d23a6565bde65809e01d1b7e5eb39709e64 (patch)
tree874d31f0b901e08c8b981db9214841ba43246734
parente3762133d229514d5c98adb6156ffb62127c9ef7 (diff)
downloadchef-fed81d23a6565bde65809e01d1b7e5eb39709e64.tar.gz
[CHEF-3410] Remove call to super to avoid erroneous error messages.
-rw-r--r--chef/lib/chef/provider/service/upstart.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/chef/lib/chef/provider/service/upstart.rb b/chef/lib/chef/provider/service/upstart.rb
index 27582ed6f1..763a2aa92b 100644
--- a/chef/lib/chef/provider/service/upstart.rb
+++ b/chef/lib/chef/provider/service/upstart.rb
@@ -65,10 +65,10 @@ class Chef
@upstart_command_success = true
end
- def define_resource_requirements
- super
-
- requirements.assert(:all_actions) do |a|
+ def define_resource_requirements
+ # Do not call super, only call shared requirements
+ shared_resource_requirements
+ requirements.assert(:all_actions) do |a|
if !@command_success
whyrun_msg = @new_resource.status_command ? "Provided status command #{@new_resource.status_command} failed." :
"Could not determine upstart state for service"