From d23a2f4548fab56f955a94527aacf40d5696971d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 2 Feb 2017 16:13:02 +0100 Subject: [PATCH] Fix multilib exclude pattern to not match noarch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- pungi/gather_dnf.py | 2 +- tests/test_gather.py | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pungi/gather_dnf.py b/pungi/gather_dnf.py index 96b7ebe2..b90a708d 100644 --- a/pungi/gather_dnf.py +++ b/pungi/gather_dnf.py @@ -325,7 +325,7 @@ class Gather(GatherBase): with Profiler("Gather.add_initial_packages():exclude"): # TODO: debug if pattern.endswith(".+"): - pkgs = self.q_multilib_binary_packages.filter(name__glob=pattern[:-2]) + pkgs = self.q_multilib_binary_packages.filter(name__glob=pattern[:-2], arch__neq='noarch') elif pattern.endswith(".src"): pkgs = self.q_source_packages.filter(name__glob=pattern[:-4]) else: diff --git a/tests/test_gather.py b/tests/test_gather.py index 5d954098..4de2c967 100644 --- a/tests/test_gather.py +++ b/tests/test_gather.py @@ -1711,10 +1711,6 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase): def test_bash_older(self): pass - @unittest.skip('Not implemented yet') - def test_multilib_exclude_pattern_does_not_match_noarch(self): - pass - def test_firefox_selfhosting_with_krb5_lookaside(self): super(DNFDepsolvingTestCase, self).test_firefox_selfhosting_with_krb5_lookaside() self.assertFlags("dummy-krb5-1.10-5.x86_64", [PkgFlag.lookaside])