Fix conda run output marker script (#18412) (#18413)

Author: Kartik Raj

pythonFiles/get_output_via_markers.py

@@ -10,15 +10,21 @@
 print(">>>PYTHON-EXEC-OUTPUT")
 
 module = sys.argv[1]
-if module == "-c":
-    ns = {}
-    for code in sys.argv[2:]:
-        exec(code, ns, ns)
-elif module.startswith("-"):
-    raise NotImplementedError(sys.argv)
-elif module.endswith(".py"):
-    runpy.run_path(module, run_name="__main__")
-else:
-    runpy.run_module(module, run_name="__main__", alter_sys=True)
-
-print("<<<PYTHON-EXEC-OUTPUT")
+try:
+    if module == "-c":
+        ns = {}
+        for code in sys.argv[2:]:
+            exec(code, ns, ns)
+    elif module.startswith("-m"):
+        moduleName = sys.argv[2]
+        sys.argv = sys.argv[2:]  # It should begin with the module name.
+        runpy.run_module(moduleName, run_name="__main__", alter_sys=True)
+    elif module.endswith(".py"):
+        sys.argv = sys.argv[1:]
+        runpy.run_path(module, run_name="__main__")
+    elif module.startswith("-"):
+        raise NotImplementedError(sys.argv)
+    else:
+        runpy.run_module(module, run_name="__main__", alter_sys=True)
+finally:
+    print("<<<PYTHON-EXEC-OUTPUT")

src/client/common/process/rawProcessApis.ts

@@ -164,8 +164,8 @@ function filterOutputUsingCondaRunMarkers(stdout: string) {
     // run, see `get_output_via_markers.py`.
     const regex = />>>PYTHON-EXEC-OUTPUT([\s\S]*)<<<PYTHON-EXEC-OUTPUT/;
     const match = stdout.match(regex);
-    const filteredOut = match !== null && match.length >= 2 ? match[1].trim() : '';
-    return filteredOut.length ? filteredOut : stdout;
+    const filteredOut = match !== null && match.length >= 2 ? match[1].trim() : undefined;
+    return filteredOut !== undefined ? filteredOut : stdout;
 }
 
 function removeCondaRunMarkers(out: string) {