Merge branch 'main' of github.com:FyraLabs/anda

FyraLabs · Dec 1, 2024 · 1ed1922 · 1ed1922
2 parents 3f691af + 500799f
commit 1ed1922
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/anda-config/config.rs b/anda-config/config.rs
@@ -183,6 +183,8 @@ pub struct RpmBuild {
     pub pre_script: Option<PathBuf>,
     pub post_script: Option<PathBuf>,
     pub enable_scm: Option<bool>,
+    #[serde(default)]
+    pub extra_repos: Vec<String>,
     pub scm_opts: Option<BTreeMap<String, String>>,
     pub config: Option<BTreeMap<String, String>>,
     pub mock_config: Option<String>,

diff --git a/src/builder.rs b/src/builder.rs
@@ -276,6 +276,7 @@ pub async fn build_project(
     }
 
     if let Some(rpmbuild) = &proj.rpm {
+        rpm_opts.extra_repos = Some(rpmbuild.extra_repos.clone());
         if let Some(srcdir) = &rpmbuild.sources {
             rpm_opts.sources.clone_from(srcdir);
         }

diff --git a/src/util.rs b/src/util.rs
@@ -1,6 +1,6 @@
 //! Utility functions and types
 use anda_config::{Docker, DockerImage, Manifest, Project, RpmBuild};
-use clap_verbosity_flag::LevelFilter;
+use clap_verbosity_flag::log::LevelFilter;
 use color_eyre::{eyre::eyre, Result, Section};
 use console::style;
 use nix::{sys::signal, unistd::Pid};