summaryrefslogtreecommitdiffstats
path: root/urpm
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:12:43 +0100
commit64bb8dbff19ea55b772912686817fc15e9253e13 (patch)
treebddd6e366187f32cdcc50eebfc57f75f385cae3a /urpm
parentd05d439bc326605a7350033fcce4fd6e52befe5f (diff)
downloadurpmi-64bb8dbff19ea55b772912686817fc15e9253e13.tar
urpmi-64bb8dbff19ea55b772912686817fc15e9253e13.tar.gz
urpmi-64bb8dbff19ea55b772912686817fc15e9253e13.tar.bz2
urpmi-64bb8dbff19ea55b772912686817fc15e9253e13.tar.xz
urpmi-64bb8dbff19ea55b772912686817fc15e9253e13.zip
Fix test for whether any 32-bit packages are installed.
(cherry picked from commit b4fdc9137e3797c61f735feec430288ecac3ab0f)
Diffstat (limited to 'urpm')
-rw-r--r--urpm/media.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 4b9d887e..24e56ba1 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -773,7 +773,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$/;