gather-dnf: Support dotarch in filter_packages

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
(cherry picked from commit 2c61416423)
This commit is contained in:
Lubomír Sedlář 2023-09-22 13:32:20 +02:00 committed by Stepan Oksanichenko
parent 6af11d5747
commit 305deab9ed
Signed by: soksanichenko
GPG Key ID: AB9983172AB1E45B

View File

@ -40,7 +40,7 @@ def get_source_name(pkg):
return pkg.sourcerpm.rsplit("-", 2)[0] return pkg.sourcerpm.rsplit("-", 2)[0]
def filter_dotarch(queue, pattern): def filter_dotarch(queue, pattern, **kwargs):
"""Filter queue for packages matching the pattern. If pattern matches the """Filter queue for packages matching the pattern. If pattern matches the
dotarch format of <name>.<arch>, it is processed as such. Otherwise it is dotarch format of <name>.<arch>, it is processed as such. Otherwise it is
treated as just a name. treated as just a name.
@ -465,12 +465,16 @@ class Gather(GatherBase):
name__glob=pattern[:-4], reponame__neq=self.opts.lookaside_repos name__glob=pattern[:-4], reponame__neq=self.opts.lookaside_repos
) )
elif pungi.util.pkg_is_debug(pattern): elif pungi.util.pkg_is_debug(pattern):
pkgs = self.q_debug_packages.filter( pkgs = filter_dotarch(
name__glob=pattern, reponame__neq=self.opts.lookaside_repos self.q_debug_packages,
pattern,
reponame__neq=self.opts.lookaside_repos,
) )
else: else:
pkgs = self.q_binary_packages.filter( pkgs = filter_dotarch(
name__glob=pattern, reponame__neq=self.opts.lookaside_repos self.q_binary_packages,
pattern,
reponame__neq=self.opts.lookaside_repos,
) )
exclude.update(pkgs) exclude.update(pkgs)