almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix multilib exclude pattern to not match noarch

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-02-02 16:13:02 +01:00
parent 5533bf7ca3
commit d23a2f4548
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/gather_dnf.py
View File

@ -325,7 +325,7 @@ class Gather(GatherBase):
with Profiler("Gather.add_initial_packages():exclude"): with Profiler("Gather.add_initial_packages():exclude"):
# TODO: debug # TODO: debug
if pattern.endswith(".+"): 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"): elif pattern.endswith(".src"):
pkgs = self.q_source_packages.filter(name__glob=pattern[:-4]) pkgs = self.q_source_packages.filter(name__glob=pattern[:-4])
else: else:

4
tests/test_gather.py
View File

@ -1711,10 +1711,6 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
def test_bash_older(self): def test_bash_older(self):
pass 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): def test_firefox_selfhosting_with_krb5_lookaside(self):
super(DNFDepsolvingTestCase, self).test_firefox_selfhosting_with_krb5_lookaside() super(DNFDepsolvingTestCase, self).test_firefox_selfhosting_with_krb5_lookaside()
self.assertFlags("dummy-krb5-1.10-5.x86_64", [PkgFlag.lookaside]) self.assertFlags("dummy-krb5-1.10-5.x86_64", [PkgFlag.lookaside])