PR#654: gather: nodeps should take packages from comps groups - pungi

pungi

#654 gather: nodeps should take packages from comps groups

Merged 8 years ago by lsedlar. Opened 8 years ago by lsedlar.

lsedlar/pungi nodeps-comps into master

gather: nodeps should take packages from comps groups

Lubomír Sedlář • 8 years ago

8c48dfb

pungi/phases/gather/methods/method_nodeps.py

file modified

+23 -1

		`@@ -16,6 +16,7 @@`

		`import pungi.arch`
		`from pungi.util import pkg_is_rpm, pkg_is_srpm, pkg_is_debug`
		`+ from pungi.wrappers.comps import CompsWrapper`

		`import pungi.phases.gather.method`
		`from kobo.pkgset import SimpleRpmWrapper, RpmWrapper`
		`@@ -24,7 +25,9 @@`
		`class GatherMethodNodeps(pungi.phases.gather.method.GatherMethodBase):`
		`enabled = True`

		`- def __call__(self, arch, variant, packages, groups, filter_packages, multilib_whitelist, multilib_blacklist, package_sets, path_prefix=None, fulltree_excludes=None, prepopulate=None):`
		`+ def __call__(self, arch, variant, pkgs, groups, filter_packages,`
		`+ multilib_whitelist, multilib_blacklist, package_sets,`
		`+ path_prefix=None, fulltree_excludes=None, prepopulate=None):`
		`global_pkgset = package_sets["global"]`
		`result = {`
		`"rpm": [],`
		`@@ -32,6 +35,9 @@`
		`"debuginfo": [],`
		`}`

		`+ group_packages = expand_groups(self.compose, arch, groups)`
		`+ packages = pkgs \| group_packages`
		`+`
		`seen_rpms = {}`
		`seen_srpms = {}`

		`@@ -89,3 +95,19 @@`
		`})`

		`return result`
		`+`
		`+`
		`+ def expand_groups(compose, arch, groups):`
		`+ """Read comps file filtered for given architecture and return all packages`
		`+ in given groups.`
		`+`
		`+ :returns: A set of tuples (pkg_name, arch)`
		`+ """`
		`+ comps_file = compose.paths.work.comps(arch, create_dir=False)`
		`+ comps = CompsWrapper(comps_file)`
		`+ packages = set()`
		`+`
		`+ for group in groups:`
		`+ packages.update([(pkg, arch) for pkg in comps.get_packages(group)])`
		`+`
		`+ return packages`

pungi/wrappers/comps.py

file modified

		`@@ -58,6 +58,13 @@`
		`"""Return a list of group IDs."""`
		`return [group.id for group in self.comps.groups]`

		`+ def get_packages(self, group):`
		`+ """Return list of package names in given group."""`
		`+ for grp in self.comps.groups:`
		`+ if grp.id == group:`
		`+ return [pkg.name for pkg in grp.packages]`
		`+ raise KeyError('No such group %r' % group)`
		`+`
		`def write_comps(self, comps_obj=None, target_file=None):`
		`if not comps_obj:`
		`comps_obj = self.generate_comps()`

tests/test_comps_wrapper.py

file modified

+11

		`@@ -41,6 +41,17 @@`
		`comps.get_comps_groups(),`
		`['core', 'standard', 'text-internet', 'firefox', 'resilient-storage', 'basic-desktop'])`

		`+ def test_get_packages(self):`
		`+ comps = CompsWrapper(COMPS_FILE)`
		`+ self.assertItemsEqual(`
		`+ comps.get_packages('text-internet'),`
		`+ {'dummy-elinks', 'dummy-tftp'})`
		`+`
		`+ def test_get_packages_for_non_existing_group(self):`
		`+ comps = CompsWrapper(COMPS_FILE)`
		`+ with self.assertRaises(KeyError):`
		`+ comps.get_packages('foo')`
		`+`
		`def test_write_comps(self):`
		`comps = CompsWrapper(COMPS_FILE)`
		`comps.write_comps(target_file=self.file.name)`

tests/test_gather_method_nodeps.py

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ # -- coding: utf-8 --`
		`+`
		`+ import mock`
		`+ import os`
		`+ import sys`
		`+`
		`+ sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))`
		`+`
		`+ from pungi.phases.gather.methods import method_nodeps as nodeps`
		`+ from tests import helpers`
		`+`
		`+ COMPS_FILE = os.path.join(helpers.FIXTURE_DIR, 'comps.xml')`
		`+`
		`+`
		`+ class TestWritePungiConfig(helpers.PungiTestCase):`
		`+ def setUp(self):`
		`+ super(TestWritePungiConfig, self).setUp()`
		`+ self.compose = helpers.DummyCompose(self.topdir, {})`
		`+ self.compose.DEBUG = False`
		`+ self.compose.paths.work.comps = mock.Mock(return_value=COMPS_FILE)`
		`+`
		`+ def test_expand_group(self):`
		`+ packages = nodeps.expand_groups(self.compose, 'x86_64', ['core', 'text-internet'])`
		`+ self.assertItemsEqual(packages, [('dummy-bash', 'x86_64'),`
		`+ ('dummy-elinks', 'x86_64'),`
		`+ ('dummy-tftp', 'x86_64')])`

lsedlar commented 8 years ago

When gather_method is set to nodeps, we should not ignore the comps group that the method received. Instead it should find out which packages are in those groups and take them into the compose.

In order for this to be of any reasonable use, the comps file needs to include all dependencies for the packages.

Fixes: #653

rebased

8 years ago

lsedlar commented 8 years ago

@jkaluza, would you mind testing if this solves your issue?

rebased

8 years ago

rebased

8 years ago

Pull-Request has been merged by lsedlar

8 years ago