summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2019-05-25 09:13:37 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2019-05-25 09:15:31 +0100
commit3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294 (patch)
tree6e315354d2acfb627538821a8ad396b00c00f55e /urpm/media.pm
parent1074e0e5103113c8a4ec913c8e88e6544165f2cd (diff)
downloadurpmi-3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294.tar
urpmi-3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294.tar.gz
urpmi-3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294.tar.bz2
urpmi-3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294.tar.xz
urpmi-3dfb4c7f7cb5d33cbc15f12041dc5d3ef4153294.zip
Don't enable 32-bit media by default on 64-bit systems (mga#24376)
Diffstat (limited to 'urpm/media.pm')
-rw-r--r--urpm/media.pm6
1 files changed, 4 insertions, 2 deletions
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));
}