PR#685: Add support for debugsource packages - pungi

Lubomír Sedlář • 6 years ago

d92390b

pungi/gather.py

file modified

+1 -3

		`@@ -67,9 +67,7 @@`


		`def is_debug(po):`
		`- if "debuginfo" in po.name:`
		`- return True`
		`- return False`
		`+ return "debuginfo" in po.name or "debugsource" in po.name`


		`def is_source(po):`

pungi/gather_dnf.py

file modified

+4 -1

		`@@ -25,6 +25,9 @@`
		`import pungi.multilib_dnf`
		`from pungi.profiler import Profiler`

		`+ # Globs for package name that should match all debuginfo packages`
		`+ DEBUG_GLOBS = ["-debuginfo", "-debuginfo-", "-debugsource", "-debugsource-"]`
ignatenkobrain commented 6 years ago last should never happen. debugsource is one per source package.
lsedlar commented 6 years ago Ok, so then let's remove it (I added it to mirror the existing globs).
lsedlar commented 6 years ago Actually, let's keep it this way just to be sure: it does not hurt anything and might be a bit more future proof.
		`+`

		`def get_source_name(pkg):`
		`# Workaround for rhbz#1418298`
		`@@ -120,7 +123,7 @@`
		`q_multilib = q.difference(q_native).union(q_noarch).apply()`

		`# 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_multilib_debug_packages = self.q_debug_packages.intersection(q_multilib)`

pungi/util.py

file modified

+2 -2

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