diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,4 @@ +- fix finding better pkg (mga#23037) - make logs more reproductible Version 5.16 - 10 February 2018 diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 2a0b1c4..7b3b1e3 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -336,6 +336,7 @@ sub _find_required_package__sort { my ($best, @other) = sort { $a->[1] <=> $b->[1] #- we want the lowest (ie preferred arch) || $b->[2] <=> $a->[2] #- and the higher score + || $b->[0]->compare_pkg($a->[0]) #- then by EVR (for upgrade) || $a->[0]->fullname cmp $b->[0]->fullname; #- then by name } map { my $score = 0; @@ -359,7 +360,7 @@ sub _find_required_package__sort { if ($urpm->{media}) { @chosen_with_score = sort { $a->[2] != $b->[2] ? - $a->[0]->id <=> $b->[0]->id : + $b->[0]->compare_pkg($a->[0]) : $b->[1] <=> $a->[1] || $b->[0]->compare_pkg($a->[0]); } map { [ $_, _score_for_locales($urpm, $db, $_), pkg2media($urpm->{media}, $_) ] } @chosen; } else { |