From 550a9574348fcf09099610ba1501b17cb7477f0d Mon Sep 17 00:00:00 2001 From: Jesse Jaggars Date: Tue, 20 Mar 2012 13:47:00 -0500 Subject: adding timeout to callExtProg as well --- sos/plugins/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index f06c1fba..500f813f 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -403,13 +403,12 @@ class Plugin(object): if filespec not in self.copyPaths: self.copyPaths.append((filespec, sub)) - def callExtProg(self, prog): + def callExtProg(self, prog, timeout=300): """Execute a command independantly of the output gathering part of sosreport. """ # pylint: disable-msg = W0612 - status, shout, runtime = sosGetCommandOutput(prog) - return (status, shout, runtime) + return sosGetCommandOutput(prog, timeout) def checkExtprog(self, prog): """Execute a command independently of the output gathering part of -- cgit