diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/local_repo_transaction.rs | 9 | ||||
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/problem.rs | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs b/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs index 7b60522..5d9c0d5 100644 --- a/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs +++ b/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs @@ -14,12 +14,11 @@ impl LocalRepoTransaction { locked_repository: &dyn RepositoryInterface, local_repository: &dyn InstalledRepositoryInterface, ) -> Self { - // TODO(phase-c): RepositoryInterface::get_packages yields BasePackageHandle; widen each to - // PackageInterfaceHandle (via .into()) and feed them to Transaction::new once the repository - // getters expose handles here. - let _ = (locked_repository, local_repository); Self { - inner: Transaction::new(Vec::new(), Vec::new()), + inner: Transaction::new( + local_repository.get_packages(), + locked_repository.get_packages(), + ), } } diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index 740909f..7312bda 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -757,10 +757,13 @@ impl Problem { } } - // TODO(phase-c): filtering out packages from a LockArrayRepository needs the handle's - // repository back-reference (phase-c handoff item #1), which is not yet available; keep - // all packages for now. - let non_locked_packages: Vec<&BasePackageHandle> = packages.iter().collect(); + let non_locked_packages: Vec<&BasePackageHandle> = packages + .iter() + .filter(|p| { + !p.get_repository() + .map_or(false, |r| r.is::<LockArrayRepository>()) + }) + .collect(); if non_locked_packages.len() == 0 { return ( |