util: subprocess: Fix stdout/err yield only if in desired set of even…

…ts to listen to Signed-off-by: John Andersen <[email protected]>
intel · Jul 7, 2022 · 5e7c10d · 5e7c10d
1 parent a70420c
commit 5e7c10d
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/dffml/util/subprocess.py b/dffml/util/subprocess.py
@@ -81,12 +81,16 @@ async def run_command_events(
                     repr(cmd) + ": " + b"".join(output["combinded"]).decode()
                 )
             else:
-                yield Subprocess.STDERR, b"".join(
-                    output[Subprocess.STDERR_READLINE]
-                )
-                yield Subprocess.STDOUT, b"".join(
-                    output[Subprocess.STDOUT_READLINE]
-                )
+                # If caller wants event
+                if Subprocess.STDERR in events:
+                    yield Subprocess.STDERR, b"".join(
+                        output[Subprocess.STDERR_READLINE]
+                    )
+                if Subprocess.STDOUT in events:
+                    yield Subprocess.STDOUT, b"".join(
+                        output[Subprocess.STDOUT_READLINE]
+                    )
+                return
         # If caller wants event
         if events and event in events:
             yield event, result