From e18a8d94560ced45d81c84d302843e8de04e7465 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 14 Sep 2007 09:59:04 +0000 Subject: - fix bug occurring with --keep (thanks to akurtakov for reporting it on #mandriva-cooker) the fix is to drop field {psel} from {backport}, it's unused anyway --- NEWS | 2 ++ URPM/Resolve.pm | 13 +++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index b8341ee..e315233 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- fix bug occurring with --keep + Version 2.00 - 13 September 2007, by Pascal "Pixel" Rigaux - speedup is_arch_compat (7 times faster) by keeping the platform in a cache diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 0424951..cca9a2d 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -405,14 +405,11 @@ sub backtrack_selected { exists $state->{backtrack}{selected}{$_->id} and next; #- a package if found is problably rejected or there is a problem. if ($state->{rejected}{$_->fullname}) { - #- keep in mind a backtrack has happening here... - _add_rejected_backtrack($state, $_, { - exists $dep->{promote} ? (promote => [ $dep->{promote} ]) : @{[]}, - exists $dep->{psel} ? (psel => $dep->{psel}) : @{[]}, - }); - #- backtrack callback should return a strictly positive value if the selection of the new - #- package is prefered over the currently selected package. - next; + #- keep in mind a backtrack has happening here... + exists $dep->{promote} and _add_rejected_backtrack($state, $_, { promote => [ $dep->{promote} ] }); + #- backtrack callback should return a strictly positive value if the selection of the new + #- package is prefered over the currently selected package. + next; } $state->{backtrack}{selected}{$_->id} = undef; -- cgit v1.2.1