fix: remove packages after restoring files

Author: jnsgruk

src/experiments/sudors.rs

@@ -57,9 +57,6 @@ impl<'a> SudoRsExperiment<'a> {
 
     /// Disable the experiment by removing the package and restoring the original files.
     pub fn disable(&self) -> Result<()> {
-        info!("Removing {}", PACKAGE);
-        self.system.remove_package(PACKAGE)?;
-
         for f in Self::sudors_files() {
             let filename = f.file_name().unwrap();
             let existing = match which(filename) {
@@ -69,6 +66,9 @@ impl<'a> SudoRsExperiment<'a> {
             self.system.restore_file(existing.clone())?;
         }
 
+        info!("Removing {}", PACKAGE);
+        self.system.remove_package(PACKAGE)?;
+
         Ok(())
     }
 

src/experiments/uutils.rs

@@ -81,9 +81,6 @@ impl<'a> UutilsExperiment<'a> {
 
     /// Disable the experiment by removing the package and restoring the original files.
     pub fn disable(&self) -> Result<()> {
-        info!("Removing {}", self.package);
-        self.system.remove_package(&self.package)?;
-
         let files = self.system.list_files(self.bin_directory.clone())?;
 
         for f in files {
@@ -95,6 +92,9 @@ impl<'a> UutilsExperiment<'a> {
             self.system.restore_file(existing)?;
         }
 
+        info!("Removing {}", self.package);
+        self.system.remove_package(&self.package)?;
+
         Ok(())
     }
 }