diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-05-25 09:13:37 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-10-19 16:45:32 +0100 |
| commit | 935beef3db2c7603c2c1e55b431e99b74c3dd146 (patch) | |
| tree | b03b848c50d5ba910453929d25b65232d2715d84 | |
| parent | 47be347d65e30c8f0b80d1d1ed66295fd9a4dbe3 (diff) | |
| download | urpmi-935beef3db2c7603c2c1e55b431e99b74c3dd146.tar urpmi-935beef3db2c7603c2c1e55b431e99b74c3dd146.tar.gz urpmi-935beef3db2c7603c2c1e55b431e99b74c3dd146.tar.bz2 urpmi-935beef3db2c7603c2c1e55b431e99b74c3dd146.tar.xz urpmi-935beef3db2c7603c2c1e55b431e99b74c3dd146.zip | |
Don't enable 32-bit media by default on 64-bit systems (mga#24376)
(cherry picked from commit 3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/media.pm | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,5 @@ +- don't enable 32-bit media by default on 64-bit systems (mga#24376) + Version 8.110 - 13 July 2017 - workaround a segfault in gurpmi (mga#21167) @@ -4711,4 +4713,3 @@ Version 0.9-34mdk - Jan 04 2000, by Chmouel Boudjnah * Mon Nov 15 1999 Pixel - changed the handling of urpmi, added urpmi.addmedia... - 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)); } |