almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

Drop compatibility helper for dnf.Package.source_name

Browse Source 
The bug that caused the attribute to have wrong value has been fixed in
DNF a long time ago.

Fixes: https://pagure.io/pungi/issue/1786
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
(cherry picked from commit 225f04cf43326c136e95356681f1461270673ca6)
This commit is contained in:
Lubomír Sedlář 2024-09-09 10:28:28 +02:00 committed by Stepan Oksanichenko
parent c586c0b03b
commit 9594954287
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pungi/gather_dnf.py
View File

@ -35,11 +35,6 @@ from pungi.profiler import Profiler
from pungi.util import DEBUG_PATTERNS from pungi.util import DEBUG_PATTERNS
def get_source_name(pkg):
# Workaround for rhbz#1418298
return pkg.sourcerpm.rsplit("-", 2)[0]
def filter_dotarch(queue, pattern, **kwargs): 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
@ -389,7 +384,7 @@ class Gather(GatherBase):
# lookaside # lookaside
if self.is_from_lookaside(i): if self.is_from_lookaside(i):
self._set_flag(i, PkgFlag.lookaside) self._set_flag(i, PkgFlag.lookaside)
if i.sourcerpm.rsplit("-", 2)[0] in self.opts.fulltree_excludes: if i.source_name in self.opts.fulltree_excludes:
self._set_flag(i, PkgFlag.fulltree_exclude) self._set_flag(i, PkgFlag.fulltree_exclude)
def _get_package_deps(self, pkg, debuginfo=False): def _get_package_deps(self, pkg, debuginfo=False):
@ -839,7 +834,7 @@ class Gather(GatherBase):
continue continue
if self.is_from_lookaside(i): if self.is_from_lookaside(i):
self._set_flag(i, PkgFlag.lookaside) self._set_flag(i, PkgFlag.lookaside)
srpm_name = i.sourcerpm.rsplit("-", 2)[0] srpm_name = i.source_name
if srpm_name in self.opts.fulltree_excludes: if srpm_name in self.opts.fulltree_excludes:
self._set_flag(i, PkgFlag.fulltree_exclude) self._set_flag(i, PkgFlag.fulltree_exclude)
if PkgFlag.input in self.result_package_flags.get(srpm_name, set()): if PkgFlag.input in self.result_package_flags.get(srpm_name, set()):
@ -871,7 +866,7 @@ class Gather(GatherBase):
for pkg in sorted(self.result_binary_packages): for pkg in sorted(self.result_binary_packages):
assert pkg is not None assert pkg is not None
if get_source_name(pkg) in self.opts.fulltree_excludes: if pkg.source_name in self.opts.fulltree_excludes:
self.logger.debug("No fulltree for %s due to exclude list", pkg) self.logger.debug("No fulltree for %s due to exclude list", pkg)
continue continue