aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-08-09 17:12:44 +0000
committerFrancois Pons <fpons@mandriva.com>2002-08-09 17:12:44 +0000
commit4a2697eb846739d81ae19d66afe908fdad246fbc (patch)
treea2ed8c7cd3cc4de6e5aa327879265cd37254f3d2 /URPM
parent2c70532f3f7466c2db2294690407df1fdd781e5b (diff)
downloadperl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.tar
perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.tar.gz
perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.tar.bz2
perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.tar.xz
perl-URPM-4a2697eb846739d81ae19d66afe908fdad246fbc.zip
0.60-5mdk
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 4f4207e..fdac138 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -649,11 +649,11 @@ sub request_packages_to_upgrade {
}
#- examine all packages which may be conflicting, it a package conflicts, it should not be requested.
- my @names = keys %names;
+ my @names = map { $_->name." == ".$_->epoch.":".$_->version."-".$_->release } values %names;
my @pkgs = values %names;
foreach my $pkg (@pkgs) {
foreach my $conflict ($pkg->conflicts) {
- delete @names{grep { ranges_overlap($conflict, $_) } @names};
+ delete @names{map { /(\S*)/ && $1 } grep { ranges_overlap($conflict, $_) } @names};
}
}