deb: allow adding multiple ppas for deps

src/deb/local.rs

@@ -18,7 +18,7 @@ pub async fn build(
     series: &str,
     build_root: &str,
     cross: bool,
-    ppa: Option<&str>,
+    ppa: Option<&[&str]>,
     inject_packages: Option<&[&str]>,
 ) -> Result<(), Box<dyn Error>> {
     // Environment
@@ -58,9 +58,11 @@ pub async fn build(
 
     let mut sources = apt::sources::load(None)?;
     let mut modified = false;
+    let mut added_ppas: Vec<(&str, &str)> = Vec::new();
 
-    // Add PPA repository if specified
-    if let Some(ppa_str) = ppa {
+    // Add PPA repositories if specified
+    if let Some(ppas) = ppa {
+        for ppa_str in ppas {
             // PPA format: user/ppa_name
             let parts: Vec<&str> = ppa_str.split('/').collect();
             if parts.len() == 2 {
@@ -90,6 +92,7 @@ pub async fn build(
                     };
                     sources.push(new_source);
                     modified = true;
+                    added_ppas.push((parts[0], parts[1]));
                     log::info!(
                         "Added PPA: {} for series {} with architectures {:?}",
                         ppa_str,
@@ -98,7 +101,10 @@ pub async fn build(
                     );
                 }
             } else {
-            return Err("Invalid PPA format. Expected: user/ppa_name".into());
+                return Err(
+                    format!("Invalid PPA format: '{}'. Expected: user/ppa_name", ppa_str).into(),
+                );
+            }
         }
     }
 
@@ -113,14 +119,14 @@ pub async fn build(
     if modified {
         apt::sources::save_legacy(None, sources, "/etc/apt/sources.list")?;
 
-        // Download and import PPA key if we added a PPA
-        if let Some(ppa_str) = ppa {
-            let parts: Vec<&str> = ppa_str.split('/').collect();
-            if parts.len() == 2
-                && let Err(e) =
-                    crate::apt::keyring::download_trust_ppa_key(None, parts[0], parts[1]).await
+        // Download and import PPA keys for all added PPAs
+        for (user, ppa_name) in added_ppas {
+            if let Err(e) = crate::apt::keyring::download_trust_ppa_key(None, user, ppa_name).await
             {
-                warn!("Failed to download PPA key for {}: {}", ppa_str, e);
+                warn!(
+                    "Failed to download PPA key for {}/{}: {}",
+                    user, ppa_name, e
+                );
             }
         }
     }

src/deb/mod.rs

@@ -23,7 +23,7 @@ pub async fn build_binary_package(
     cwd: Option<&Path>,
     cross: bool,
     mode: Option<BuildMode>,
-    ppa: Option<&str>,
+    ppa: Option<&[&str]>,
     inject_packages: Option<&[&str]>,
 ) -> Result<(), Box<dyn Error>> {
     let cwd = cwd.unwrap_or_else(|| Path::new("."));

src/main.rs

@@ -54,7 +54,8 @@ fn main() {
                 .about("Build the source package into binary package (.deb)")
                 .arg(arg!(-s --series <series> "Target distribution series").required(false))
                 .arg(arg!(-a --arch <arch> "Target architecture").required(false))
-                .arg(arg!(--ppa <ppa> "Build the package adding a specific PPA for dependencies").required(false))
+                .arg(arg!(--ppa <ppa> "Build the package adding a specific PPA for dependencies (can be specified multiple times)")
+                    .long_help("Build the package adding a specific PPA for dependencies. Can be specified multiple times.").required(false).action(clap::ArgAction::Append))
                 .arg(arg!(--inject <package> "Inject a package into the build environment (can be specified multiple times)")
                     .long_help("Inject a package into the build environment before build-dep. Can be a .deb file path, a package name from the archive, or a package from a previously added PPA. Can be specified multiple times.").required(false).action(clap::ArgAction::Append))
                 .arg(arg!(--cross "Cross-compile for target architecture (instead of qemu-binfmt)")
@@ -162,7 +163,15 @@ fn main() {
             let series = sub_matches.get_one::<String>("series").map(|s| s.as_str());
             let arch = sub_matches.get_one::<String>("arch").map(|s| s.as_str());
             let cross = sub_matches.get_one::<bool>("cross").unwrap_or(&false);
-            let ppa = sub_matches.get_one::<String>("ppa").map(|s| s.as_str());
+            let ppa: Vec<&str> = sub_matches
+                .get_many::<String>("ppa")
+                .map(|v| v.map(|s| s.as_str()).collect())
+                .unwrap_or_default();
+            let ppa = if ppa.is_empty() {
+                None
+            } else {
+                Some(ppa.as_slice())
+            };
             let inject_packages: Vec<&str> = sub_matches
                 .get_many::<String>("inject")
                 .map(|v| v.map(|s| s.as_str()).collect())