aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Jaggars <jjaggars@redhat.com>2012-03-20 13:47:00 -0500
committerJesse Jaggars <jjaggars@redhat.com>2012-03-20 13:47:00 -0500
commit550a9574348fcf09099610ba1501b17cb7477f0d (patch)
tree69707bfd690364f3bd8769d313958550ca59d8a4
parent2300c2e0d61ad6a241e82ffbcfcb72822f1f70ee (diff)
downloadsos-550a9574348fcf09099610ba1501b17cb7477f0d.tar.gz
adding timeout to callExtProg as well
-rw-r--r--sos/plugins/__init__.py5
1 files 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