aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-09-02 17:18:44 +0000
committerFrancois Pons <fpons@mandriva.com>2003-09-02 17:18:44 +0000
commitdfe8349e151ddbd3423b5cd5c9fdc65e31a9ef74 (patch)
tree30a533ebcef13036fe589e37c12df162d91275fa /URPM
parent885cb5cc1e429206d5be5579114a81bd03741a87 (diff)
downloadperl-URPM-dfe8349e151ddbd3423b5cd5c9fdc65e31a9ef74.tar
perl-URPM-dfe8349e151ddbd3423b5cd5c9fdc65e31a9ef74.tar.gz
perl-URPM-dfe8349e151ddbd3423b5cd5c9fdc65e31a9ef74.tar.bz2
perl-URPM-dfe8349e151ddbd3423b5cd5c9fdc65e31a9ef74.tar.xz
perl-URPM-dfe8349e151ddbd3423b5cd5c9fdc65e31a9ef74.zip
fixed package badly removed.
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index a644994..e6b67b6 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -420,6 +420,8 @@ sub resolve_requested {
@{$packages->{$p->name}};
if (length $best) {
+ print STDERR "using1 $best for promoting $n\n";
+ print STDERR $urpm->{depslist}[$best]->fullname."\n";
push @properties, { required => $best, promote => $n, psel => $pkg };
} else {
#- no package have been found, we may need to remove the package examined unless
@@ -437,8 +439,10 @@ sub resolve_requested {
}
if (@best == @l) {
+ print STDERR "using2 @best for promoting $n\n";
push @properties, map { +{ required => $_, promote => $n, psel => $pkg } } @best;
} else {
+ print STDERR "rejecting after trying to promote $n\n";
if ($options{keep}) {
unshift @properties, $urpm->backtrack_selected($db, $state,
{ keep => scalar $p->fullname,
@@ -560,7 +564,7 @@ sub resolve_requested {
#- without an operator, anything (with the same name) is matched.
#- with an operator, check with package EVR with the obsoletes EVR.
my $satisfied = !$o || eval($p->compare($v) . $o . 0);
- $p->name eq $pkg->name && $p->fullname eq $pkg->fullname || $satisfied or return;
+ $p->name eq $pkg->name || $satisfied or return;
#- do not propagate now the broken dependencies as they are
#- computed later.