diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-26 19:12:36 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-26 19:12:36 +0000 |
| commit | 1a13dfee64dc7f126ba1858d3198467fed5f1eef (patch) | |
| tree | dffa77cb1aeb972181b0a3f286b7a5c217a1f092 | |
| parent | d4848db669d74915dd7a1cbd8b98168cc0445dc5 (diff) | |
| download | urpmi-1a13dfee64dc7f126ba1858d3198467fed5f1eef.tar urpmi-1a13dfee64dc7f126ba1858d3198467fed5f1eef.tar.gz urpmi-1a13dfee64dc7f126ba1858d3198467fed5f1eef.tar.bz2 urpmi-1a13dfee64dc7f126ba1858d3198467fed5f1eef.tar.xz urpmi-1a13dfee64dc7f126ba1858d3198467fed5f1eef.zip | |
simplify
| -rw-r--r-- | urpm/parallel.pm | 3 | ||||
| -rwxr-xr-x | urpmq | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/urpm/parallel.pm b/urpm/parallel.pm index 13f748e5..c6ec96f4 100644 --- a/urpm/parallel.pm +++ b/urpm/parallel.pm @@ -235,8 +235,7 @@ sub _simple_resolve_dependencies { foreach (keys %$requested) { if (/\|/) { #- taken from URPM::Resolve to filter out choices, not complete though. - my $packages = $urpm->find_candidate_packages($_); - foreach (values %$packages) { + foreach ($urpm->find_candidate_packages_($_)) { my ($best_requested, $best); foreach (@$_) { exists $state->{selected}{$_->id} and $best_requested = $_, last; @@ -313,8 +313,7 @@ if ($options{list_aliases}) { #- finally conflicts that will force a new upgrade or a remove. while (defined ($dep = shift @properties)) { #- take the best package for each choices of same name. - my $packages = $urpm->find_candidate_packages($dep); - foreach (values %$packages) { + foreach ($urpm->find_candidate_packages_($dep)) { my ($best_requested, $best); foreach (@$_) { if ($best_requested || exists $requested{$_->id}) { |