Add support for debugsource packages

These packages should behave like regular debuginfo packages (at least
for now).

Fixes: https://pagure.io/pungi/issue/684
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-07-26 10:29:27 +02:00
parent 65078ef9cf
commit d92390b80b
3 changed files with 7 additions and 6 deletions

View File

@ -67,9 +67,7 @@ def yumlocked(method):
def is_debug(po): def is_debug(po):
if "debuginfo" in po.name: return "debuginfo" in po.name or "debugsource" in po.name
return True
return False
def is_source(po): def is_source(po):

View File

@ -25,6 +25,9 @@ import pungi.dnf_wrapper
import pungi.multilib_dnf import pungi.multilib_dnf
from pungi.profiler import Profiler from pungi.profiler import Profiler
# Globs for package name that should match all debuginfo packages
DEBUG_GLOBS = ["*-debuginfo", "*-debuginfo-*", "*-debugsource", "*-debugsource-*"]
def get_source_name(pkg): def get_source_name(pkg):
# Workaround for rhbz#1418298 # Workaround for rhbz#1418298
@ -120,7 +123,7 @@ class GatherBase(object):
q_multilib = q.difference(q_native).union(q_noarch).apply() q_multilib = q.difference(q_native).union(q_noarch).apply()
# debug packages # debug packages
self.q_debug_packages = q.filter(name__glob=["*-debuginfo", "*-debuginfo-*"]).apply() self.q_debug_packages = q.filter(name__glob=DEBUG_GLOBS).apply()
self.q_native_debug_packages = self.q_debug_packages.intersection(q_native) self.q_native_debug_packages = self.q_debug_packages.intersection(q_native)
self.q_multilib_debug_packages = self.q_debug_packages.intersection(q_multilib) self.q_multilib_debug_packages = self.q_debug_packages.intersection(q_multilib)

View File

@ -192,11 +192,11 @@ def pkg_is_debug(pkg_obj):
return False return False
if isinstance(pkg_obj, str): if isinstance(pkg_obj, str):
# string # string
if "-debuginfo" in pkg_obj: if "-debuginfo" in pkg_obj or '-debugsource' in pkg_obj:
return True return True
else: else:
# package object # package object
if "-debuginfo" in pkg_obj.name: if "-debuginfo" in pkg_obj.name or '-debugsource' in pkg_obj.name:
return True return True
return False return False