fix(rustup-mode): return ExitCode(1) when update() fails

Author: rami3l

src/cli/common.rs

@@ -293,6 +293,8 @@ pub(crate) async fn update_all_channels(
     force_update: bool,
 ) -> Result<utils::ExitCode> {
     let toolchains = cfg.update_all_channels(force_update).await?;
+    let has_update_error = toolchains.iter().any(|(_, r)| r.is_err());
+    let mut exit_code = utils::ExitCode(if has_update_error { 1 } else { 0 });
 
     if toolchains.is_empty() {
         info!("no updatable toolchains installed");
@@ -312,11 +314,14 @@ pub(crate) async fn update_all_channels(
     };
 
     if do_self_update {
-        self_update(show_channel_updates, cfg.process).await
+        let self_update_exit_code = self_update(show_channel_updates, cfg.process).await?;
+        if self_update_exit_code != utils::ExitCode(0) {
+            exit_code = self_update_exit_code;
+        }
     } else {
         show_channel_updates()?;
-        Ok(utils::ExitCode(0))
     }
+    Ok(exit_code)
 }
 
 #[derive(Clone, Copy, Debug)]

src/cli/rustup_mode.rs

@@ -789,6 +789,8 @@ async fn check_updates(cfg: &Cfg<'_>) -> Result<utils::ExitCode> {
 }
 
 async fn update(cfg: &mut Cfg<'_>, opts: UpdateOpts) -> Result<utils::ExitCode> {
+    let mut exit_code = utils::ExitCode(0);
+
     common::warn_if_host_is_emulated(cfg.process);
     let self_update_mode = cfg.get_self_update_mode()?;
     // Priority: no-self-update feature > self_update_mode > no-self-update args.
@@ -865,7 +867,7 @@ async fn update(cfg: &mut Cfg<'_>, opts: UpdateOpts) -> Result<utils::ExitCode>
             common::self_update(|| Ok(()), cfg.process).await?;
         }
     } else {
-        common::update_all_channels(cfg, self_update, opts.force).await?;
+        exit_code = common::update_all_channels(cfg, self_update, opts.force).await?;
         info!("cleaning up downloads & tmp directories");
         utils::delete_dir_contents_following_links(&cfg.download_dir);
         cfg.tmp_cx.clean();
@@ -880,7 +882,7 @@ async fn update(cfg: &mut Cfg<'_>, opts: UpdateOpts) -> Result<utils::ExitCode>
         info!("any updates to rustup will need to be fetched with your system package manager")
     }
 
-    Ok(utils::ExitCode(0))
+    Ok(exit_code)
 }
 
 async fn run(

src/utils/utils.rs

@@ -21,6 +21,7 @@ pub(crate) use crate::utils::utils::raw::is_directory;
 
 pub use crate::utils::utils::raw::{is_file, path_exists};
 
+#[derive(Debug, PartialEq, Eq)]
 pub struct ExitCode(pub i32);
 
 impl From<ExitStatus> for ExitCode {