almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix fulltree when greedy

Browse Source 
When greedy, fulltree should pull in all native and multilib packages.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-01-16 13:35:55 +01:00
parent 3a6653fbc2
commit b53e4a84d3
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pungi/gather_dnf.py
View File

@ -593,10 +593,13 @@ class Gather(GatherBase):
# fallback / default # fallback / default
pull_native = True pull_native = True
if pull_native: # We pull packages determined by `pull_native`, or everything
fulltree_pkgs = native_fulltree_pkgs # if we're greedy
else: fulltree_pkgs = []
fulltree_pkgs = multilib_fulltree_pkgs if pull_native or self.opts.greedy_method == 'all':
fulltree_pkgs.extend(native_fulltree_pkgs)
if not pull_native or self.opts.greedy_method == 'all':
fulltree_pkgs.extend(multilib_fulltree_pkgs)
# always pull all noarch subpackages # always pull all noarch subpackages
fulltree_pkgs += noarch_fulltree_pkgs fulltree_pkgs += noarch_fulltree_pkgs

8
tests/test_gather.py
View File

@ -1688,18 +1688,10 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
dummy-bash-debuginfo.x86_64 as well. dummy-bash-debuginfo.x86_64 as well.
""" """
@unittest.skip('Full does not pull in dummy-nscd.i686')
def test_bash_multilib_greedy(self):
pass
@unittest.skip('DNF code does not support NVR as input') @unittest.skip('DNF code does not support NVR as input')
def test_bash_older(self): def test_bash_older(self):
pass pass
@unittest.skip('Misses dummy-nscd.i686')
def test_bash_multilib_filter_greedy(self):
pass
@unittest.skip('Not implemented yet') @unittest.skip('Not implemented yet')
def test_smtpdaemon_greedy_all_explicit_sendmail(self): def test_smtpdaemon_greedy_all_explicit_sendmail(self):
pass pass