PR#90: Exclude debuginfo from product listings - compose-utils

compose-utils

#90 Exclude debuginfo from product listings

Merged 5 years ago by lsedlar. Opened 5 years ago by lsedlar.

lsedlar/compose-utils listing-debuginfo into master

Exclude debuginfo from product listings

Lubomír Sedlář • 5 years ago

3ae3831

compose_utils/__init__.py

file modified

+1 -1

		`@@ -80,7 +80,7 @@`
		`nvra = kobo.rpmlib.parse_nvra(nevra)`
		`if pkg_arches and nvra["arch"] not in pkg_arches:`
		`continue`
		`- if nvra["arch"] == "src":`
		`+ if srpm_data[nevra]["category"] != "binary":`
		`continue`
		`pkgs.append("%(name)s.%(arch)s" % nvra)`

tests/fixtures/filtered-listing.json

file modified

-27

		`@@ -2,18 +2,15 @@`
		`"Client": {`
		`"i386": {`
		`"Dummy-firefox": [`
		`- "Dummy-firefox-debuginfo.i686",`
		`"Dummy-firefox.i686"`
		`],`
		`"Dummy-xulrunner": [`
		`- "Dummy-xulrunner-debuginfo.i686",`
		`"Dummy-xulrunner.i686"`
		`],`
		`"dummy-basesystem": [`
		`"dummy-basesystem.noarch"`
		`],`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.i686",`
		`"dummy-bash.i686"`
		`],`
		`"dummy-filesystem": [`
		`@@ -21,30 +18,24 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.i686",`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo.i686",`
		`"dummy-glibc.i686"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.i686",`
		`"dummy-lvm2-libs.i686",`
		`"dummy-lvm2.i686"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.i686",`
		`"dummy-tftp.i686"`
		`]`
		`},`
		`"x86_64": {`
		`"Dummy-xulrunner": [`
		`- "Dummy-xulrunner-debuginfo.x86_64",`
		`"Dummy-xulrunner.x86_64"`
		`],`
		`"dummy-basesystem": [`
		`"dummy-basesystem.noarch"`
		`],`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.x86_64",`
		`"dummy-bash.x86_64"`
		`],`
		`"dummy-filesystem": [`
		`@@ -52,20 +43,14 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.x86_64",`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo-common.x86_64",`
		`- "dummy-glibc-debuginfo.i686",`
		`- "dummy-glibc-debuginfo.x86_64",`
		`"dummy-glibc.i686",`
		`"dummy-glibc.x86_64"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.x86_64",`
		`"dummy-lvm2-libs.x86_64",`
		`"dummy-lvm2.x86_64"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.x86_64",`
		`"dummy-tftp.x86_64"`
		`]`
		`}`
		`@@ -73,7 +58,6 @@`
		`"Server": {`
		`"s390x": {`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.s390x",`
		`"dummy-bash.s390x"`
		`],`
		`"dummy-filesystem": [`
		`@@ -81,17 +65,13 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.s390x",`
		`- "dummy-glibc-debuginfo-common.s390x",`
		`- "dummy-glibc-debuginfo.s390x",`
		`"dummy-glibc.s390x"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.s390x",`
		`"dummy-lvm2-libs.s390x",`
		`"dummy-lvm2.s390x"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.s390x",`
		`"dummy-tftp.s390x"`
		`]`
		`},`
		`@@ -100,7 +80,6 @@`
		`"dummy-basesystem.noarch"`
		`],`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.x86_64",`
		`"dummy-bash.x86_64"`
		`],`
		`"dummy-filesystem": [`
		`@@ -108,22 +87,16 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.x86_64",`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo-common.x86_64",`
		`- "dummy-glibc-debuginfo.i686",`
		`- "dummy-glibc-debuginfo.x86_64",`
		`"dummy-glibc.i686",`
		`"dummy-glibc.x86_64"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.x86_64",`
		`"dummy-lvm2-devel.i686",`
		`"dummy-lvm2-devel.x86_64",`
		`"dummy-lvm2-libs.x86_64",`
		`"dummy-lvm2.x86_64"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.x86_64",`
		`"dummy-tftp.x86_64"`
		`]`
		`}`

tests/fixtures/full-listing.json

file modified

-28

		`@@ -2,18 +2,15 @@`
		`"Client": {`
		`"i386": {`
		`"Dummy-firefox": [`
		`- "Dummy-firefox-debuginfo.i686",`
		`"Dummy-firefox.i686"`
		`],`
		`"Dummy-xulrunner": [`
		`- "Dummy-xulrunner-debuginfo.i686",`
		`"Dummy-xulrunner.i686"`
		`],`
		`"dummy-basesystem": [`
		`"dummy-basesystem.noarch"`
		`],`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.i686",`
		`"dummy-bash.i686"`
		`],`
		`"dummy-filesystem": [`
		`@@ -21,34 +18,27 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.i686",`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo.i686",`
		`"dummy-glibc.i686"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.i686",`
		`"dummy-lvm2-libs.i686",`
		`"dummy-lvm2.i686"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.i686",`
		`"dummy-tftp.i686"`
		`]`
		`},`
		`"x86_64": {`
		`"Dummy-firefox": [`
		`- "Dummy-firefox-debuginfo.x86_64",`
		`"Dummy-firefox.x86_64"`
		`],`
		`"Dummy-xulrunner": [`
		`- "Dummy-xulrunner-debuginfo.x86_64",`
		`"Dummy-xulrunner.x86_64"`
		`],`
		`"dummy-basesystem": [`
		`"dummy-basesystem.noarch"`
		`],`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.x86_64",`
		`"dummy-bash.x86_64"`
		`],`
		`"dummy-filesystem": [`
		`@@ -56,20 +46,14 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.x86_64",`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo-common.x86_64",`
		`- "dummy-glibc-debuginfo.i686",`
		`- "dummy-glibc-debuginfo.x86_64",`
		`"dummy-glibc.i686",`
		`"dummy-glibc.x86_64"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.x86_64",`
		`"dummy-lvm2-libs.x86_64",`
		`"dummy-lvm2.x86_64"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.x86_64",`
		`"dummy-tftp.x86_64"`
		`]`
		`}`
		`@@ -80,7 +64,6 @@`
		`"dummy-basesystem.noarch"`
		`],`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.s390x",`
		`"dummy-bash.s390x"`
		`],`
		`"dummy-filesystem": [`
		`@@ -88,17 +71,13 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.s390x",`
		`- "dummy-glibc-debuginfo-common.s390x",`
		`- "dummy-glibc-debuginfo.s390x",`
		`"dummy-glibc.s390x"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.s390x",`
		`"dummy-lvm2-libs.s390x",`
		`"dummy-lvm2.s390x"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.s390x",`
		`"dummy-tftp.s390x"`
		`]`
		`},`
		`@@ -107,7 +86,6 @@`
		`"dummy-basesystem.noarch"`
		`],`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.x86_64",`
		`"dummy-bash.x86_64"`
		`],`
		`"dummy-filesystem": [`
		`@@ -115,22 +93,16 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.x86_64",`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo-common.x86_64",`
		`- "dummy-glibc-debuginfo.i686",`
		`- "dummy-glibc-debuginfo.x86_64",`
		`"dummy-glibc.i686",`
		`"dummy-glibc.x86_64"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.x86_64",`
		`"dummy-lvm2-devel.i686",`
		`"dummy-lvm2-devel.x86_64",`
		`"dummy-lvm2-libs.x86_64",`
		`"dummy-lvm2.x86_64"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.x86_64",`
		`"dummy-tftp.x86_64"`
		`]`
		`}`

tests/fixtures/listing-multilib.json

file modified

-4

		`@@ -2,8 +2,6 @@`
		`"Client": {`
		`"x86_64": {`
		`"dummy-glibc": [`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo.i686",`
		`"dummy-glibc.i686"`
		`]`
		`}`
		`@@ -11,8 +9,6 @@`
		`"Server": {`
		`"x86_64": {`
		`"dummy-glibc": [`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo.i686",`
		`"dummy-glibc.i686"`
		`],`
		`"dummy-lvm2": [`

tests/fixtures/listing-server-x86_64.json

file modified

-7

		`@@ -5,7 +5,6 @@`
		`"dummy-basesystem.noarch"`
		`],`
		`"dummy-bash": [`
		`- "dummy-bash-debuginfo.x86_64",`
		`"dummy-bash.x86_64"`
		`],`
		`"dummy-filesystem": [`
		`@@ -13,22 +12,16 @@`
		`],`
		`"dummy-glibc": [`
		`"dummy-glibc-common.x86_64",`
		`- "dummy-glibc-debuginfo-common.i686",`
		`- "dummy-glibc-debuginfo-common.x86_64",`
		`- "dummy-glibc-debuginfo.i686",`
		`- "dummy-glibc-debuginfo.x86_64",`
		`"dummy-glibc.i686",`
		`"dummy-glibc.x86_64"`
		`],`
		`"dummy-lvm2": [`
		`- "dummy-lvm2-debuginfo.x86_64",`
		`"dummy-lvm2-devel.i686",`
		`"dummy-lvm2-devel.x86_64",`
		`"dummy-lvm2-libs.x86_64",`
		`"dummy-lvm2.x86_64"`
		`],`
		`"dummy-tftp": [`
		`- "dummy-tftp-debuginfo.x86_64",`
		`"dummy-tftp.x86_64"`
		`]`
		`}`