Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows: remove double printing on commands and their output #4940

Merged
merged 2 commits into from
Dec 17, 2021
Merged

Windows: remove double printing on commands and their output #4940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2966b0e
process: remove double printing
rjbou Nov 26, 2021
bbf3132
update changes
rjbou Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ users)
* Bump version to 2.2.0~alpha~dev [#4725 @dra27]
* Add specific comparison function on several module (that includes `OpamStd.ABSTRACT`) [#4918 @rjbou]
* Homogeneise is_archive tar & zip: if file exists check magic number, otherwise check extension [#4964 @rjbou]
* [BUG] Remove windows double printing on commands and their output [#4940 @rjbou]

## Internal: Windows
* Support MSYS2: treat MSYS2 and Cygwin as equivalent [#4813 @jonahbeckford]
Expand Down
4 changes: 2 additions & 2 deletions src/core/opamProcess.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,8 +639,8 @@ let exit_status p return =
if isset_verbose_f () then
stop_verbose_f ()
else if p.p_verbose then
(verbose_print_cmd p;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is already printed on set_verbose_process call.

List.iter verbose_print_out stdout;
(List.iter verbose_print_out stdout;
if p.p_stdout <> p.p_stderr then
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By default stderr is set to stdout.

List.iter verbose_print_out stderr;
flush OpamCompat.Stdlib.stdout);
let info =
Expand Down