From 3e58be6b46a3a2f4784da9cfb3aa1e6ecf2708fe Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 21 Oct 2019 17:09:38 +0100
Subject: Fix test for whether any 32-bit packages are installed.

(cherry picked from commit b4fdc9137e3797c61f735feec430288ecac3ab0f)
---
 NEWS          | 2 ++
 urpm/media.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index d1b7b848..d7f9c646 100644
--- a/NEWS
+++ b/NEWS
@@ -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$/;
-- 
cgit v1.2.1