From 3fa00195b47e97f26e5048a865eb309e12748a5e Mon Sep 17 00:00:00 2001 From: "R. Boujbel" Date: Fri, 17 Dec 2021 18:24:14 +0100 Subject: [PATCH] Merge pull request #4940 from rjbou/win-proc Windows: remove double printing on commands and their output --- CHANGES | 2 ++ src/core/opamProcess.ml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 43be189adbe..3b1737a106c 100644 --- 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 index cde94f23868..770b7fc9dee 100644 --- 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 =