diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-14 09:59:04 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-14 09:59:04 +0000 |
commit | e18a8d94560ced45d81c84d302843e8de04e7465 (patch) | |
tree | daaa23056ec2c87b8ac415012e997bd5323fcfbc | |
parent | 0b5c0e3e487aa5081a6c048ba0583972e5d1d681 (diff) | |
download | perl-URPM-e18a8d94560ced45d81c84d302843e8de04e7465.tar perl-URPM-e18a8d94560ced45d81c84d302843e8de04e7465.tar.gz perl-URPM-e18a8d94560ced45d81c84d302843e8de04e7465.tar.bz2 perl-URPM-e18a8d94560ced45d81c84d302843e8de04e7465.tar.xz perl-URPM-e18a8d94560ced45d81c84d302843e8de04e7465.zip |
- 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
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | URPM/Resolve.pm | 13 |
2 files changed, 7 insertions, 8 deletions
@@ -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; |