From a2783f0b7207c2bdb7ab2b2903835cb7a8acb544 Mon Sep 17 00:00:00 2001
From: KGB99 <k.birgi@gmail.com>
Date: Fri, 16 Aug 2024 16:20:22 +0100
Subject: [PATCH] add requested changes

---
 src/lib.rs                | 7 +++----
 src/main.rs               | 2 +-
 src/opt.rs                | 4 ++--
 src/tool_configuration.rs | 4 ----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index a4235affc..6677aee81 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -128,7 +128,6 @@ pub fn get_tool_config(
         use_bz2: args.common.use_bz2,
         render_only: args.render_only,
         skip_existing: args.skip_existing,
-        cont_on_fail: args.cont_on_fail,
         ..Configuration::default()
     })
 }
@@ -350,6 +349,7 @@ pub async fn get_build_output(
 pub async fn run_build_from_args(
     build_output: Vec<Output>,
     tool_config: Configuration,
+    continue_on_fail: bool,
 ) -> miette::Result<()> {
     let mut outputs: Vec<metadata::Output> = Vec::new();
 
@@ -361,11 +361,10 @@ pub async fn run_build_from_args(
             }
             Err(e) => {
                 tracing::error!("Error building package: {}", e);
-                if tool_config.cont_on_fail {
+                if continue_on_fail {
                     continue;
-                } else {
-                    return Err(e);
                 }
+                return Err(e);
             }
         };
         outputs.push(output);
diff --git a/src/main.rs b/src/main.rs
index faf10a43e..6ca40db6c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -117,7 +117,7 @@ async fn main() -> miette::Result<()> {
                 }
 
                 sort_build_outputs_topologically(&mut outputs, build_args.up_to.as_deref())?;
-                run_build_from_args(outputs, tool_config).await?;
+                run_build_from_args(outputs, tool_config, build_args.continue_on_fail).await?;
             }
             Ok(())
         }
diff --git a/src/opt.rs b/src/opt.rs
index deb95f431..ac92acd67 100644
--- a/src/opt.rs
+++ b/src/opt.rs
@@ -346,8 +346,8 @@ pub struct BuildOpts {
 
     /// Whether to continue building upon the failure of one recipe
     /// Only relevant when building multiple recipes with `--recipe-dir`
-    #[arg(long, default_value = "false")]
-    pub cont_on_fail: bool,
+    #[arg(long, default_value = "false", requires="recipe_dir")]
+    pub continue_on_fail: bool,
 }
 
 fn is_dir(dir: &str) -> Result<PathBuf, String> {
diff --git a/src/tool_configuration.rs b/src/tool_configuration.rs
index 408d072a1..1121174ad 100644
--- a/src/tool_configuration.rs
+++ b/src/tool_configuration.rs
@@ -53,9 +53,6 @@ pub struct Configuration {
     /// Whether to skip existing packages
     pub skip_existing: SkipExisting,
 
-    /// Whether to continue building on failure of a package
-    pub cont_on_fail: bool,
-
     /// The channel configuration to use when parsing channels.
     pub channel_config: ChannelConfig,
 
@@ -111,7 +108,6 @@ impl Default for Configuration {
             use_bz2: true,
             render_only: false,
             skip_existing: SkipExisting::None,
-            cont_on_fail: false,
             channel_config: ChannelConfig::default_with_root_dir(
                 std::env::current_dir().unwrap_or_else(|_err| PathBuf::from("/")),
             ),