From 3bb0c94eb6d62e6773da3bcd2043ce85937d6cfc Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sat, 28 Oct 2023 19:36:09 +0300 Subject: [PATCH 1/2] change default output mode of `BootstrapCommand` Signed-off-by: onur-ozkan --- src/bootstrap/src/utils/exec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/src/utils/exec.rs b/src/bootstrap/src/utils/exec.rs index 9c1c21cd95894..0aede2022badd 100644 --- a/src/bootstrap/src/utils/exec.rs +++ b/src/bootstrap/src/utils/exec.rs @@ -54,7 +54,7 @@ impl<'a> From<&'a mut Command> for BootstrapCommand<'a> { Self { command, failure_behavior: BehaviorOnFailure::Exit, - output_mode: OutputMode::SuppressOnSuccess, + output_mode: OutputMode::PrintAll, } } } From 236f6ba261593e9704af8fe188ace73b3e395594 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sat, 28 Oct 2023 20:02:41 +0300 Subject: [PATCH 2/2] set `BootstrapCommand` output mode for submodules Signed-off-by: onur-ozkan --- src/bootstrap/src/lib.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 8dd1a698dfa8e..d7f49a6d11b9c 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -586,7 +586,11 @@ impl Build { .args(&["diff-index", "--quiet", "HEAD"]) .current_dir(&absolute_path), ) - .allow_failure(), + .allow_failure() + .output_mode(match self.is_verbose() { + true => OutputMode::PrintAll, + false => OutputMode::PrintOutput, + }), ); if has_local_modifications { self.run(Command::new("git").args(&["stash", "push"]).current_dir(&absolute_path));