32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
|
From 5e27b92a8a9f066af4c41ddd0bedc7c69187ff52 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Moravec <pmoravec@redhat.com>
|
||
|
|
Date: Mon, 2 May 2022 22:13:34 +0200
|
||
|
|
Subject: [PATCH] [utilities] Close file only when storing to file
|
||
|
|
|
||
|
|
Call _output.close() only when to_file=true.
|
||
|
|
|
||
|
|
Closes: #2925
|
||
|
|
|
||
|
|
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
||
|
|
---
|
||
|
|
sos/utilities.py | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/sos/utilities.py b/sos/utilities.py
|
||
|
|
index d2f73d86..1075d1d4 100644
|
||
|
|
--- a/sos/utilities.py
|
||
|
|
+++ b/sos/utilities.py
|
||
|
|
@@ -212,7 +212,8 @@ def sos_get_command_output(command, timeout=TIMEOUT_DEFAULT, stderr=False,
|
||
|
|
p.wait(timeout if timeout else None)
|
||
|
|
except Exception:
|
||
|
|
p.terminate()
|
||
|
|
- _output.close()
|
||
|
|
+ if to_file:
|
||
|
|
+ _output.close()
|
||
|
|
# until we separate timeouts from the `timeout` command
|
||
|
|
# handle per-cmd timeouts via Plugin status checks
|
||
|
|
return {'status': 124, 'output': reader.get_contents(),
|
||
|
|
--
|
||
|
|
2.34.3
|
||
|
|
|