Merge pull request ocaml#4940 from rjbou/win-proc

Windows: remove double printing on commands and their output
rjbou · Aug 8, 2022 · 3fa0019 · 3fa0019
1 parent 065aaa9
commit 3fa0019
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -30,6 +30,8 @@ are not marked). Those prefixed with "(+)" are new command/option (since
   [#4978 @kit-ty-kate]
 * Clearer error message if a command doesn't exist
   [#4971 @kit-ty-kat - fix #4112]
+* [BUG] Remove windows double printing on commands and their output
+  [#4940 @rjbou]
 * Actually allow multiple state caches to co-exist
   [#4934 @dra27 - actually fixes #4554]
 * Update cold compiler to 4.13 to avoid issues with glibc 2.34 on Unix

diff --git a/src/core/opamProcess.ml b/src/core/opamProcess.ml
@@ -641,8 +641,8 @@ let exit_status p return =
   if isset_verbose_f () then
     stop_verbose_f ()
   else if p.p_verbose then
-    (verbose_print_cmd p;
-     List.iter verbose_print_out stdout;
+    (List.iter verbose_print_out stdout;
+     if p.p_stdout <> p.p_stderr then
      List.iter verbose_print_out stderr;
      flush Stdlib.stdout);
   let info =