diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-10-21 17:09:38 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-10-21 17:28:18 +0100 |
| commit | 3e58be6b46a3a2f4784da9cfb3aa1e6ecf2708fe (patch) | |
| tree | 3307fbec7e949957270a8f5ad3c63f99ffe8050b | |
| parent | 70d53c4519b96275455c31c66667c6a045c2ad76 (diff) | |
| download | urpmi-3e58be6b46a3a2f4784da9cfb3aa1e6ecf2708fe.tar urpmi-3e58be6b46a3a2f4784da9cfb3aa1e6ecf2708fe.tar.gz urpmi-3e58be6b46a3a2f4784da9cfb3aa1e6ecf2708fe.tar.bz2 urpmi-3e58be6b46a3a2f4784da9cfb3aa1e6ecf2708fe.tar.xz urpmi-3e58be6b46a3a2f4784da9cfb3aa1e6ecf2708fe.zip | |
Fix test for whether any 32-bit packages are installed.
(cherry picked from commit b4fdc9137e3797c61f735feec430288ecac3ab0f)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/media.pm | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- fix test for whether any 32-bit packages are installed + Version 8.110.1 - 19 October 2019 - don't enable 32-bit media by default on 64-bit systems (mga#24376) diff --git a/urpm/media.pm b/urpm/media.pm index 1e1ddeae..ca84e6e0 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -771,7 +771,7 @@ sub needed_extra_media { my ($nonfree, $tainted, $add32bit); $db->traverse(sub { my ($pkg) = @_; - return if $nonfree && $tainted; + return if $nonfree && $tainted && $add32bit; my $rel = $pkg->release; $nonfree ||= $rel =~ /nonfree$/; $tainted ||= $rel =~ /tainted$/; |