aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-03-27 10:28:34 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-03-27 10:28:34 +0000
commit162a434adbfca7aae278435d51da88af90eff10a (patch)
tree013b20af08ccbf1e30e61fe3b8412cbb1ddfb9d3 /URPM
parent77e61863876ebcba7b6391a8d945b61a4e0df4f4 (diff)
downloadperl-URPM-162a434adbfca7aae278435d51da88af90eff10a.tar
perl-URPM-162a434adbfca7aae278435d51da88af90eff10a.tar.gz
perl-URPM-162a434adbfca7aae278435d51da88af90eff10a.tar.bz2
perl-URPM-162a434adbfca7aae278435d51da88af90eff10a.tar.xz
perl-URPM-162a434adbfca7aae278435d51da88af90eff10a.zip
Revert part of the fix for bug #47803 since it breaks upgrades from 2008.1
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 5cd7480..ef956cc 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1235,13 +1235,11 @@ sub _handle_diff_provides {
} elsif ($options{keep}) {
backtrack_selected_psel_keep($urpm, $db, $state, $pkg, [ scalar $p->fullname ]);
} else {
- my %diff_provides_h;
- set_rejected_and_compute_diff_provides($urpm, $state, \%diff_provides_h, {
+ resolve_rejected_($urpm, $db, $state, $properties, {
rejected_pkg => $p, removed => 1,
from => $pkg,
why => { unsatisfied => \@unsatisfied },
});
- push @$diff_provides, map { +{ name => $_, pkg => $pkg } } keys %diff_provides_h;
}
}
}