summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2019-10-21 17:09:38 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2019-10-21 17:28:18 +0100
commit3e58be6b46a3a2f4784da9cfb3aa1e6ecf2708fe (patch)
tree3307fbec7e949957270a8f5ad3c63f99ffe8050b /urpm/media.pm
parent70d53c4519b96275455c31c66667c6a045c2ad76 (diff)
downloadurpmi-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)
Diffstat (limited to 'urpm/media.pm')
-rw-r--r--urpm/media.pm2
1 files changed, 1 insertions, 1 deletions
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$/;