PR#345: Remove special case for -devel modules - odcs

Lubomír Sedlář • 4 years ago

568d028

server/conf/pungi.conf

file modified

-8

		`@@ -140,11 +140,3 @@`
		`koji_profile = '{{ config.koji_profile }}'`

		`repoclosure_strictness = [('.', {'': 'off'})]`
		`-`
		`- {%- if config.include_devel_modules %}`
		`- include_devel_modules = { "Temporary": [`
		`- {%- for ns in config.include_devel_modules %}`
		`- '{{ ns }}',`
		`- {%- endfor%}`
		`- ]}`
		`- {%- endif %}`

server/odcs/server/pungi.py

file modified

-28

		`@@ -161,7 +161,6 @@`
		`self.koji_profile = conf.koji_profile`
		`self.pkgset_koji_inherit = True`
		`self.lookaside_repos = lookaside_repos.split(" ") if lookaside_repos else []`
		`- self.include_devel_modules = []`
		`if arches:`
		`self.arches = arches`
		`else:`
		`@@ -201,8 +200,6 @@`
		`self.gather_method = "nodeps"`
		`self.module_defaults_url = module_defaults_url.split(" ") if module_defaults_url else []`

		`- self._sort_out_devel_modules()`
		`-`
		`if self.packages:`
		`raise ValueError("Exact packages cannot be set for MODULE "`
		`"source type.")`
		`@@ -217,31 +214,6 @@`

		`self.check_deps = bool(flags & COMPOSE_FLAGS["check_deps"])`

		`- def _sort_out_devel_modules(self):`
		`- """`
		- Helper method filtering out "-devel" modules from `self.source`
		- and adding them to `include_devel_modules` list.
		`- """`
		`- source_list = self.source.split(" ")`
		`- new_source = []`
		`- for nsvc in source_list:`
		`- n, s, v, c = nsvc.split(":")`
		`-`
		`- # It does not have -devel suffix, so it is not -devel module.`
		`- if not n.endswith("-devel"):`
		`- new_source.append(nsvc)`
		`- continue`
		`-`
		`- # If it is -devel module, there must exist the non-devel`
		`- # counterpart.`
		`- non_devel_nsvc = ":".join([n[:-len("-devel")], s, v, c])`
		`- if non_devel_nsvc not in source_list:`
		`- new_source.append(nsvc)`
		`- continue`
		`-`
		`- self.include_devel_modules.append(":".join([n, s]))`
		`- self.source = " ".join(new_source)`
		`-`
		`@property`
		`def source_type_str(self):`
		`return INVERSE_PUNGI_SOURCE_TYPE_NAMES[self.source_type]`

server/tests/test_pungi.py

file modified

+2 -5

		`@@ -332,12 +332,9 @@`
		`"MBS-512", "1", PungiSourceType.MODULE,`
		`"foo:1:1:1 foo-devel:1:1:1 bar-devel:1:1:1")`

		`- template = pungi_cfg.get_pungi_config()`
		`- cfg = self._load_pungi_cfg(template)`
		`self.assertEqual(`
		`- cfg["include_devel_modules"],`
		`- {"Temporary": ["foo-devel:1"]})`
		`- self.assertEqual(pungi_cfg.source, "foo:1:1:1 bar-devel:1:1:1")`
		`+ pungi_cfg.source, "foo:1:1:1 foo-devel:1:1:1 bar-devel:1:1:1"`
		`+ )`


		`class TestPungi(ModelsBaseTest):`