From b4a008f86a20b9ba2d2e8324b0b0f6977e6747ce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 19 2016 07:51:03 +0000 Subject: do not ad to image build and live tasks the variant if it is empty Signed-off-by: Dennis Gilmore --- diff --git a/pungi/phases/image_build.py b/pungi/phases/image_build.py index b7f4998..4974b99 100644 --- a/pungi/phases/image_build.py +++ b/pungi/phases/image_build.py @@ -58,7 +58,8 @@ class ImageBuildPhase(PhaseBase): repo = shortcuts.force_list(image_conf.get('repo', [])) extras = shortcuts.force_list(image_conf.pop('repo_from', [])) - extras.append(variant.uid) + if not variant.is_empty: + extras.append(variant.uid) for extra in extras: v = self.compose.variants.get(extra) diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py index feca975..9d0b76f 100644 --- a/pungi/phases/live_images.py +++ b/pungi/phases/live_images.py @@ -124,8 +124,10 @@ class LiveImagesPhase(PhaseBase): if 'ksurl' in data: cmd['ksurl'] = resolve_git_url(data['ksurl']) - cmd["repos"] = [translate_path( - self.compose, self.compose.paths.compose.repository(arch, variant, create_dir=False))] + cmd["repos"] = [] + if not variant.is_empty: + cmd["repos"].append(translate_path( + self.compose, self.compose.paths.compose.repository(arch, variant, create_dir=False))) # additional repos cmd["repos"].extend(data.get("additional_repos", []))