about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Beránek <jakub.beranek@vsb.cz>2024-08-09 12:17:22 +0200
committerJakub Beránek <jakub.beranek@vsb.cz>2024-08-09 14:59:33 +0200
commita380d5e8f68de64441274ca2e56dd3a08a60a121 (patch)
tree6e6e91f0e52bcd3f161cf4c3126dc8b22f9f0540
parentf72cb0415bdb6fe3699fb44f9b41da1d34c74189 (diff)
downloadrust-a380d5e8f68de64441274ca2e56dd3a08a60a121.tar.gz
rust-a380d5e8f68de64441274ca2e56dd3a08a60a121.zip
Do not print verbose error when a bootstrap command fails without verbose mode
-rw-r--r--src/bootstrap/src/lib.rs16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
index d3aff8f89a0..2062d435bfc 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
@@ -1058,20 +1058,28 @@ Executed at: {executed_at}"#,
                 CommandOutput::did_not_start(stdout, stderr)
             }
         };
+
+        let fail = |message: &str| {
+            if self.is_verbose() {
+                println!("{message}");
+            } else {
+                println!("Command has failed. Rerun with -v to see more details.");
+            }
+            exit!(1);
+        };
+
         if !output.is_success() {
             match command.failure_behavior {
                 BehaviorOnFailure::DelayFail => {
                     if self.fail_fast {
-                        println!("{message}");
-                        exit!(1);
+                        fail(&message);
                     }
 
                     let mut failures = self.delayed_failures.borrow_mut();
                     failures.push(message);
                 }
                 BehaviorOnFailure::Exit => {
-                    println!("{message}");
-                    exit!(1);
+                    fail(&message);
                 }
                 BehaviorOnFailure::Ignore => {
                     // If failures are allowed, either the error has been printed already