Fix for #565: Final merge of changes from source:branches/execute-refactor into source:trunk

Generated with
svn merge -r 2378:HEAD https://reductivelabs.com/svn/puppet/branches/execute-refactor trunk

CHANGES:
 - Puppet::Util#execute now takes hash key/value pairs as arguments after the command array.
 - Processes executed from the base service provider are now silenced.  That is, their
   standard input, output, and error pipes are all directed to /dev/null.


git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2385 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb
index c615c30c0..c736c20c2 100755
--- a/lib/puppet/provider/service/base.rb
+++ b/lib/puppet/provider/service/base.rb
@@ -114,12 +114,12 @@ Puppet::Type.type(:service).provide :base do
     # A simple wrapper so execution failures are a bit more informative.
     def texecute(type, command, fof = true)
         begin
-            output = execute(command, fof)
+            # #565: Services generally produce no output, so squelch them.
+            execute(command, :failonfail => fof, :squelch => true)
         rescue Puppet::ExecutionFailure => detail
             @model.fail "Could not %s %s: %s" % [type, @model.ref, detail]
         end
-
-        return output
+        return nil
     end
 
     # Use either a specified command or the default for our provider.