exp: cross #5

src/deb/mod.rs

@@ -51,9 +51,11 @@ pub fn build_binary_package(
     // Specific case: native cross-compilation, we don't allow that
     // instead this wraps to an automatic unshare chroot
     // using an ephemeral context
-    if cross && mode == BuildMode::Local {
-        cross::setup_native_context(series)?;
-    }
+    let _guard = if cross && mode == BuildMode::Local {
+        Some(cross::EphemeralContextGuard::new(series)?)
+    } else {
+        None
+    };
 
     // Prepare build directory
     let ctx = context::current();
@@ -83,10 +85,6 @@ pub fn build_binary_package(
         }
     }
 
-    if cross && mode == BuildMode::Local {
-        cross::clean_native_context()?;
-    }
-
     Ok(())
 }