diff --git a/crates/rattler/src/install/clobber_registry.rs b/crates/rattler/src/install/clobber_registry.rs index 5357b5954..a43cbe25c 100644 --- a/crates/rattler/src/install/clobber_registry.rs +++ b/crates/rattler/src/install/clobber_registry.rs @@ -174,8 +174,8 @@ impl ClobberRegistry { // We insert the non-renamed path here clobber_paths.insert(path.clone(), new_path); } else { - // In this case, the path we are looking at was previously removed so we need to - // add it back to the registry and to the clobbers (the idx in the registry is None) + // In this case, the path we are looking at was previously + // removed so we need to add it back to the registry self.paths_registry.insert(path.clone(), Some(name_idx)); // If we previously had clobbers with this path, we need to diff --git a/crates/rattler/src/install/test_utils.rs b/crates/rattler/src/install/test_utils.rs index 2ef6510e6..a761e99dc 100644 --- a/crates/rattler/src/install/test_utils.rs +++ b/crates/rattler/src/install/test_utils.rs @@ -10,6 +10,8 @@ use crate::{ package_cache::PackageCache, }; +use super::driver::PostProcessResult; + /// Install a package into the environment and write a `conda-meta` file that /// contains information about how the file was linked. pub async fn install_package_to_environment( @@ -124,7 +126,7 @@ pub async fn execute_transaction( package_cache: &PackageCache, install_driver: &InstallDriver, install_options: &InstallOptions, -) { +) -> PostProcessResult { install_driver .pre_process(&transaction, target_prefix) .unwrap(); @@ -143,7 +145,7 @@ pub async fn execute_transaction( install_driver .post_process(&transaction, target_prefix) - .unwrap(); + .unwrap() } pub fn find_prefix_record<'a>(