summaryrefslogtreecommitdiffstats
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:09:38 +0100
commitb4fdc9137e3797c61f735feec430288ecac3ab0f (patch)
tree38112dfc6ee193e07f1b6f9c15153efc20283592
parentdd7fee7d70856fd58c14ee86d1de4340d1308680 (diff)
downloadurpmi-b4fdc9137e3797c61f735feec430288ecac3ab0f.tar
urpmi-b4fdc9137e3797c61f735feec430288ecac3ab0f.tar.gz
urpmi-b4fdc9137e3797c61f735feec430288ecac3ab0f.tar.bz2
urpmi-b4fdc9137e3797c61f735feec430288ecac3ab0f.tar.xz
urpmi-b4fdc9137e3797c61f735feec430288ecac3ab0f.zip
Fix test for whether any 32-bit packages are installed.
-rw-r--r--NEWS2
-rw-r--r--urpm/media.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index e902f4e9..4b32a1ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix test for whether any 32-bit packages are installed
+
Version 8.119 - 19 October 2019
- when adding distrib media, enable 32-bit media if needed (mga#24438)
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$/;