From bb6f546603d8e3199bda0bfe0f9b23f1da1cb8c9 Mon Sep 17 00:00:00 2001 From: Pavel Moravec Date: Mon, 13 Jul 2015 15:03:37 +0200 Subject: [plugin] pass stderr through _collect_cmd_output Commit f06efd6 removed passing stderr in _collect_cmd_output to get_cmd_output_now. That prevents passing stderr=False in several scenarios. This fix adds the argument to be passed back. Resolves: #600 Signed-off-by: Pavel Moravec --- sos/plugins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index a06c0b1b..aed74965 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -696,7 +696,7 @@ class Plugin(object): self._log_info("collecting output of '%s'" % prog) self.get_cmd_output_now(prog, suggest_filename=suggest_filename, root_symlink=root_symlink, timeout=timeout, - chroot=chroot, runat=runat) + stderr=stderr, chroot=chroot, runat=runat) def _collect_strings(self): for string, file_name in self.copy_strings: -- cgit