summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2009-11-10 03:41:10 -0800
committerJames Turnbull <james@lovedthanlost.net>2009-11-12 08:19:11 +1100
commitb1722871ec27aa451be17e6fe6e099cc2f35cf7b (patch)
treecadadab2791a2703c57a850a3fde15cc1877409e
parent40135609c8cfc7b70369a848a383a687a216f6a7 (diff)
downloadpuppet-b1722871ec27aa451be17e6fe6e099cc2f35cf7b.tar.gz
puppet-b1722871ec27aa451be17e6fe6e099cc2f35cf7b.tar.xz
puppet-b1722871ec27aa451be17e6fe6e099cc2f35cf7b.zip
Fixing #2767 invoke-rc.d warnings
Errors written to STDERR by Debian's invoke-rc.d are spurious, since we're only using it to query whether a service can be started. I'm adding the --quiet flag to suppress those messages. Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
-rwxr-xr-xlib/puppet/provider/service/debian.rb2
-rwxr-xr-xspec/unit/provider/service/debian.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb
index 7ddbd288b..51fb7a22b 100755
--- a/lib/puppet/provider/service/debian.rb
+++ b/lib/puppet/provider/service/debian.rb
@@ -29,7 +29,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
def enabled?
# TODO: Replace system() call when Puppet::Util.execute gives us a way
# to determine exit status. http://projects.reductivelabs.com/issues/2538
- system("/usr/sbin/invoke-rc.d", "--query", @resource[:name], "start")
+ system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
# 104 is the exit status when you query start an enabled service.
# 106 is the exit status when the policy layer supplies a fallback action
diff --git a/spec/unit/provider/service/debian.rb b/spec/unit/provider/service/debian.rb
index 87d627452..ea87c375d 100755
--- a/spec/unit/provider/service/debian.rb
+++ b/spec/unit/provider/service/debian.rb
@@ -60,7 +60,7 @@ describe provider_class do
describe "when checking whether it is enabled" do
it "should call Kernel.system() with the appropriate parameters" do
- @provider.expects(:system).with("/usr/sbin/invoke-rc.d", "--query", @resource[:name], "start").once
+ @provider.expects(:system).with("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start").once
@provider.enabled?
end