Skip to content

Commit

Permalink
return post-process-result
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfv committed Oct 7, 2024
1 parent 4a510ae commit 8964416
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions crates/rattler/src/install/clobber_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions crates/rattler/src/install/test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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();
Expand All @@ -143,7 +145,7 @@ pub async fn execute_transaction(

install_driver
.post_process(&transaction, target_prefix)
.unwrap();
.unwrap()
}

pub fn find_prefix_record<'a>(
Expand Down

0 comments on commit 8964416

Please sign in to comment.