From 3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 25 May 2019 09:13:37 +0100 Subject: Don't enable 32-bit media by default on 64-bit systems (mga#24376) --- NEWS | 2 ++ urpm/media.pm | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 122b1bc7..3a6cd6ca 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- don't enable 32-bit media by default on 64-bit systems (mga#24376) + Version 8.115 - 1 May 2019 - library: 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)); } -- cgit v1.2.1