Mageia Bugzilla – Attachment 11093 Details for
Bug 24309
libreoffice new security issue CVE-2018-16858
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Fixed patch to make rpmdrake use /etc/urpmi/prefer.vendor.list
rpmdrake-prefer.patch (text/plain), 1011 bytes, created by
Martin Whitaker
on 2019-06-14 19:40:43 CEST
(
hide
)
Description:
Fixed patch to make rpmdrake use /etc/urpmi/prefer.vendor.list
Filename:
MIME Type:
Creator:
Martin Whitaker
Created:
2019-06-14 19:40:43 CEST
Size:
1011 bytes
patch
obsolete
>--- Rpmdrake/gui.pm.orig 2019-06-14 18:03:17.093987351 +0100 >+++ Rpmdrake/gui.pm 2019-06-14 18:21:10.922633350 +0100 >@@ -703,7 +703,9 @@ > } > > sub callback_choices { >- my (undef, undef, undef, $choices) = @_; >+ my ($urpm, undef, undef, $choices) = @_; >+ my ($prefered, $other) = urpm::select::get_preferred($urpm, $choices, undef); >+ $choices = [ @$prefered, @$other ]; > return $choices->[0] if $::rpmdrake_options{auto}; > foreach my $pkg (@$choices) { > foreach ($pkg->requires_nosense) { >@@ -712,7 +714,6 @@ > } > } > my $callback = sub { interactive_msg(N("More information on package..."), get_info($_[0]), scroll => 1) }; >- $choices = [ sort { $a->name cmp $b->name } @$choices ]; > my @choices = interactive_list_(N("Please choose"), (scalar(@$choices) == 1 ? > N("The following package is needed:") : N("One of the following packages is needed:")), > [ map { urpm_name($_) } @$choices ], $callback, nocancel => 1); >
--- Rpmdrake/gui.pm.orig 2019-06-14 18:03:17.093987351 +0100 +++ Rpmdrake/gui.pm 2019-06-14 18:21:10.922633350 +0100 @@ -703,7 +703,9 @@ } sub callback_choices { - my (undef, undef, undef, $choices) = @_; + my ($urpm, undef, undef, $choices) = @_; + my ($prefered, $other) = urpm::select::get_preferred($urpm, $choices, undef); + $choices = [ @$prefered, @$other ]; return $choices->[0] if $::rpmdrake_options{auto}; foreach my $pkg (@$choices) { foreach ($pkg->requires_nosense) { @@ -712,7 +714,6 @@ } } my $callback = sub { interactive_msg(N("More information on package..."), get_info($_[0]), scroll => 1) }; - $choices = [ sort { $a->name cmp $b->name } @$choices ]; my @choices = interactive_list_(N("Please choose"), (scalar(@$choices) == 1 ? N("The following package is needed:") : N("One of the following packages is needed:")), [ map { urpm_name($_) } @$choices ], $callback, nocancel => 1);
View Attachment As Raw
Actions:
View
Attachments on
bug 24309
:
10780
|
11034
| 11093