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

Handle noarch debuginfo packages

Browse Source 
Pull debuginfo packages for noarch packages as well, but only when the
debuginfo is noarch as well.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-02-06 10:42:36 +01:00
parent d23a2f4548
commit 27b24a489f
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pungi/gather_dnf.py
View File

@ -550,29 +550,33 @@ class Gather(GatherBase):
for pkg in self.result_binary_packages:
assert pkg is not None
if self.is_noarch_package(pkg):
self.finished_add_debug_packages[pkg] = []
continue
if pkg in self.finished_add_debug_packages:
continue
debug_pkgs = []
candidates = []
if pkg.sourcerpm:
if self.is_native_package(pkg):
debug_pkgs = self.native_debug_packages_cache.get(pkg.sourcerpm)
candidates = self.native_debug_packages_cache.get(pkg.sourcerpm)
else:
debug_pkgs = self.multilib_debug_packages_cache.get(pkg.sourcerpm)
candidates = self.multilib_debug_packages_cache.get(pkg.sourcerpm)
if not debug_pkgs:
if not candidates:
continue
debug_pkgs = []
lookaside = self._has_flag(pkg, PkgFlag.lookaside)
for i in debug_pkgs:
for i in candidates:
if pkg.arch == 'noarch' and i.arch != 'noarch':
# If the package is noarch, we will only pull debuginfo if
# it's noarch as well. This covers mingw use case, but
# means we don't for example pull debuginfo just because of
# -doc subpackage.
continue
if lookaside:
self._set_flag(i, PkgFlag.lookaside)
if i not in self.result_debug_packages:
added.add(i)
debug_pkgs.append(i)
self.finished_add_debug_packages[pkg] = debug_pkgs
self.result_debug_packages.update(debug_pkgs)

8
tests/test_gather.py
View File

@ -1699,14 +1699,6 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
self.get_langpacks = True
super(DNFDepsolvingTestCase, self).test_langpacks()
@unittest.skip('Not implemented yet')
def test_noarch_debuginfo(self):
"""
Noarch packages do not pull in any debuginfo. Removing the check breaks
test_bash_multilib, because dummy-bash-doc.noarch ultimately drags in
dummy-bash-debuginfo.x86_64 as well.
"""
@unittest.skip('DNF code does not support NVR as input')
def test_bash_older(self):
pass