buildinstall: Pick correct config with rootfs_size

If there are multiple matching configuration blocks, we should take the
value that is defined in the last one, but only if it actually is there.
That's how it works for other options.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-02-01 14:24:20 +01:00
parent f59034b22d
commit 8065239e04
2 changed files with 4 additions and 1 deletions

View File

@ -77,11 +77,12 @@ class BuildinstallPhase(PhaseBase):
bugurl = data.get('bugurl') bugurl = data.get('bugurl')
if not data.get('nomacboot', True): if not data.get('nomacboot', True):
nomacboot = False nomacboot = False
if "rootfs_size" in data:
rootfs_size = data.get("rootfs_size")
add_template.extend(data.get('add_template', [])) add_template.extend(data.get('add_template', []))
add_arch_template.extend(data.get('add_arch_template', [])) add_arch_template.extend(data.get('add_arch_template', []))
add_template_var.extend(data.get('add_template_var', [])) add_template_var.extend(data.get('add_template_var', []))
add_arch_template_var.extend(data.get('add_arch_template_var', [])) add_arch_template_var.extend(data.get('add_arch_template_var', []))
rootfs_size = data.get("rootfs_size")
output_dir = os.path.join(output_dir, variant.uid) output_dir = os.path.join(output_dir, variant.uid)
output_topdir = output_dir output_topdir = output_dir

View File

@ -251,6 +251,7 @@ class TestBuildinstallPhase(PungiTestCase):
'release_is_layered': False, 'release_is_layered': False,
'buildinstall_method': 'lorax', 'buildinstall_method': 'lorax',
'lorax_options': [ 'lorax_options': [
('^.*$', {'*': {}}),
('^Server$', { ('^Server$', {
'x86_64': { 'x86_64': {
'bugurl': 'http://example.com', 'bugurl': 'http://example.com',
@ -265,6 +266,7 @@ class TestBuildinstallPhase(PungiTestCase):
('^Client$', { ('^Client$', {
'*': {'nomacboot': False} '*': {'nomacboot': False}
}), }),
('^.*$', {'*': {}}),
] ]
}) })