aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-27 15:11:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-27 15:11:49 +0000
commit3965d631ca4bc7f8843c13784fa0679af33d0c21 (patch)
tree2b4b5e59226c7096c99ea0f03c206cb6b9119934
parent54aecb86a7407d5245cc0f7db944feaaabfb3b9f (diff)
downloadperl-URPM-3965d631ca4bc7f8843c13784fa0679af33d0c21.tar
perl-URPM-3965d631ca4bc7f8843c13784fa0679af33d0c21.tar.gz
perl-URPM-3965d631ca4bc7f8843c13784fa0679af33d0c21.tar.bz2
perl-URPM-3965d631ca4bc7f8843c13784fa0679af33d0c21.tar.xz
perl-URPM-3965d631ca4bc7f8843c13784fa0679af33d0c21.zip
fix previous commit
-rw-r--r--URPM/Resolve.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 04f9570..d8eca12 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1028,10 +1028,9 @@ sub _handle_diff_provides {
my @best;
foreach (@l) {
my @packages = find_candidate_packages_($urpm, $_, $state->{rejected});
- $best = join('|', map { $_->id }
- grep { $_->fullname ne $p->fullname }
- @packages);
- $best and push @best, $best;
+ if (@packages = grep { $_->fullname ne $p->fullname } @packages) {
+ push @best, join('|', map { $_->id } @packages);
+ }
}
if (@best == @l) {