fix: add topics after mount_rs again

Author: prcups

src/actions/packaging.rs

@@ -162,7 +162,7 @@ fn package_build_inner<P: AsRef<Path>>(
     packages: &[String],
     instance: &str,
     root: P,
-    apt: bool,
+    settings: BuildSettings,
 ) -> Result<(i32, usize)> {
     let total = packages.len();
     let hostname = gethostname().map_or_else(
@@ -186,12 +186,22 @@ fn package_build_inner<P: AsRef<Path>>(
         // hopefully the sequence gets flushed together with the `info!` below
         info!("[{}/{}] Building {}...", index + 1, total, package);
         mount_fs(instance)?;
+
+        if !settings.with_topics.is_empty() {
+            let mut cmd = vec!["/bin/oma", "topics", "--yes"];
+            for topic in settings.with_topics {
+                cmd.push("--opt-in");
+                cmd.push(topic);
+            }
+            run_in_container(instance, &cmd)?;
+        }
+
         info!("Refreshing local repository...");
         repo::init_repo(root.as_ref(), Path::new(instance))?;
         let mut status = -1;
         let mut oma = true;
         for i in 1..=5 {
-            status = if oma && !apt {
+            status = if oma && !settings.force_use_apt {
                 run_in_container(instance, &["/bin/bash", "-ec", OMA_UPDATE_SCRIPT]).unwrap_or(-1)
             } else {
                 run_in_container(instance, &["/bin/bash", "-ec", APT_UPDATE_SCRIPT]).unwrap_or(-1)
@@ -215,7 +225,7 @@ fn package_build_inner<P: AsRef<Path>>(
 
         let mut acbs = vec!["/bin/acbs-build"];
 
-        if apt {
+        if settings.force_use_apt {
             acbs.push("--force-use-apt");
         }
 
@@ -338,16 +348,16 @@ pub fn package_build<S: AsRef<str>, K: Clone + ExactSizeIterator<Item = S>>(
     mount_fs(instance)?;
     rollback_container(instance)?;
 
-    if !settings.with_topics.is_empty() {
-        let mut cmd = vec!["/bin/oma", "topics", "--yes"];
-        for topic in settings.with_topics {
-            cmd.push("--opt-in");
-            cmd.push(topic);
+    if !conf.local_repo {
+        if !settings.with_topics.is_empty() {
+            let mut cmd = vec!["/bin/oma", "topics", "--yes"];
+            for topic in settings.with_topics {
+                cmd.push("--opt-in");
+                cmd.push(topic);
+            }
+            run_in_container(instance, &cmd)?;
         }
-        run_in_container(instance, &cmd)?;
-    }
 
-    if !conf.local_repo {
         let mut cmd = vec!["/bin/acbs-build".to_string()];
 
         if settings.force_use_apt {
@@ -366,7 +376,7 @@ pub fn package_build<S: AsRef<str>, K: Clone + ExactSizeIterator<Item = S>>(
     let total = packages.len();
     let start = Instant::now();
     let (exit_status, progress) =
-        package_build_inner(&packages, instance, root, settings.force_use_apt)?;
+        package_build_inner(&packages, instance, root, settings)?;
     if exit_status != 0 {
         let checkpoint = BuildCheckPoint {
             packages,