Mageia Bugzilla – Attachment 11298 Details for
Bug 24438
urpmi.addmedia --distrib adds repositories with "Core 32bit Release" and "Core 32bit Updates" disabled while Nonfree/Tainted 32bit are enabled, causing problems when updating 32bit packages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
cherry-picked patch #1 needed for mga6
0001-Don-t-enable-32-bit-media-by-default-on-64-bit-syste.patch (text/plain), 1.41 KB, created by
Martin Whitaker
on 2019-10-05 16:38:59 CEST
(
hide
)
Description:
cherry-picked patch #1 needed for mga6
Filename:
MIME Type:
Creator:
Martin Whitaker
Created:
2019-10-05 16:38:59 CEST
Size:
1.41 KB
patch
obsolete
>From 03b9cc0d71d9f89f56586e1038f2b5415cbe5341 Mon Sep 17 00:00:00 2001 >From: Martin Whitaker <mageia@martin-whitaker.me.uk> >Date: Sat, 25 May 2019 09:13:37 +0100 >Subject: [PATCH 1/3] Don't enable 32-bit media by default on 64-bit systems > (mga#24376) > >(cherry picked from commit 3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294) > >diff --git a/urpm/media.pm b/urpm/media.pm >index aa78a191..62a5d5d3 100644 >--- a/urpm/media.pm >+++ b/urpm/media.pm >@@ -793,11 +793,13 @@ sub is_media_to_add_by_default { > my $non_regular_medium = intersection(\@media_types, [ qw(backports debug source testing) ]); > if (!$add_by_default && !$non_regular_medium) { > my $medium_name = $distribconf->getvalue($medium, 'name') || ''; >- if ($medium_name =~ /Nonfree/ && $nonfree) { >+ # Don't enable 32-bit media by default on 64-bit systems (mga#24376). '32bit' only appears >+ # in the medium name in the 64-bit media info, so we can simply filter on that. >+ if ($medium_name =~ /Nonfree/ && $medium_name !~ /32bit/ && $nonfree) { > $add_by_default = 1; > $urpm->{log}(N("un-ignoring non-free medium `%s' b/c nonfree packages are installed", $medium_name)); > } >- if ($medium_name =~ /Tainted/ && $tainted) { >+ if ($medium_name =~ /Tainted/ && $medium_name !~ /32bit/ && $tainted) { > $add_by_default = 1; > $urpm->{log}(N("un-ignoring tainted medium `%s' b/c tainted packages are installed", $medium_name)); > } >-- >2.21.0
From 03b9cc0d71d9f89f56586e1038f2b5415cbe5341 Mon Sep 17 00:00:00 2001 From: Martin Whitaker <mageia@martin-whitaker.me.uk> Date: Sat, 25 May 2019 09:13:37 +0100 Subject: [PATCH 1/3] Don't enable 32-bit media by default on 64-bit systems (mga#24376) (cherry picked from commit 3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294) diff --git a/urpm/media.pm b/urpm/media.pm index aa78a191..62a5d5d3 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -793,11 +793,13 @@ sub is_media_to_add_by_default { my $non_regular_medium = intersection(\@media_types, [ qw(backports debug source testing) ]); if (!$add_by_default && !$non_regular_medium) { my $medium_name = $distribconf->getvalue($medium, 'name') || ''; - if ($medium_name =~ /Nonfree/ && $nonfree) { + # Don't enable 32-bit media by default on 64-bit systems (mga#24376). '32bit' only appears + # in the medium name in the 64-bit media info, so we can simply filter on that. + if ($medium_name =~ /Nonfree/ && $medium_name !~ /32bit/ && $nonfree) { $add_by_default = 1; $urpm->{log}(N("un-ignoring non-free medium `%s' b/c nonfree packages are installed", $medium_name)); } - if ($medium_name =~ /Tainted/ && $tainted) { + if ($medium_name =~ /Tainted/ && $medium_name !~ /32bit/ && $tainted) { $add_by_default = 1; $urpm->{log}(N("un-ignoring tainted medium `%s' b/c tainted packages are installed", $medium_name)); } -- 2.21.0
View Attachment As Raw
Actions:
View
Attachments on
bug 24438
:
11291
| 11298 |
11299
|
11329
|
11330