Mageia Bugzilla – Attachment 6240 Details for
Bug 15350
Upgrade failed mga4 to mga5 when adding online media to DVD - 195 transactions failed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
sort by ids (like in other place) when promoting b/c of eg: conflicts
15350.diff (text/plain), 549 bytes, created by
Thierry Vignaud
on 2015-04-12 02:40:39 CEST
(
hide
)
Description:
sort by ids (like in other place) when promoting b/c of eg: conflicts
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2015-04-12 02:40:39 CEST
Size:
549 bytes
patch
obsolete
>diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm >index 2f580ae..5c5e14c 100644 >--- a/URPM/Resolve.pm >+++ b/URPM/Resolve.pm >@@ -1564,7 +1567,7 @@ sub _handle_conflict { > } > > if (@packages) { >- my $best = join('|', map { $_->id } @packages); >+ my $best = join('|', sort { $a <=> $b } map { $_->id } @packages); > $urpm->{debug_URPM}("promoting " . join('|', map { scalar $_->fullname } @packages) . " because of conflict above") if $urpm->{debug_URPM}; > unshift @$properties, { required => $best, promote_conflicts => $reason }; > } else {
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 2f580ae..5c5e14c 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1564,7 +1567,7 @@ sub _handle_conflict { } if (@packages) { - my $best = join('|', map { $_->id } @packages); + my $best = join('|', sort { $a <=> $b } map { $_->id } @packages); $urpm->{debug_URPM}("promoting " . join('|', map { scalar $_->fullname } @packages) . " because of conflict above") if $urpm->{debug_URPM}; unshift @$properties, { required => $best, promote_conflicts => $reason }; } else {
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 15350
:
5943
|
6020
|
6030
|
6056
|
6072
|
6073
|
6074
|
6129
|
6130
|
6158
|
6174
|
6212
|
6213
|
6239
|
6240
|
6241
|
6242