From 4a1e029c1d55f77b4721bc0c14455935ac1c66b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 22 Feb 2016 10:29:06 +0100 Subject: [PATCH] [live-images] Move repo calculation to separate method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- pungi/phases/live_images.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py index 3a2326f1..8b038c35 100644 --- a/pungi/phases/live_images.py +++ b/pungi/phases/live_images.py @@ -92,6 +92,17 @@ class LiveImagesPhase(PhaseBase): return repo + def _get_repos(self, arch, variant, data): + repos = [] + if not variant.is_empty: + repos.append(translate_path( + self.compose, self.compose.paths.compose.repository(arch, variant, create_dir=False))) + + # additional repos + repos.extend(data.get("additional_repos", [])) + repos.extend(self._get_extra_repos(arch, variant, data.get('repo_from', []))) + return repos + def _get_release(self, image_conf): """If release is set explicitly to None, replace it with date and respin.""" if 'release' in image_conf and image_conf['release'] is None: @@ -126,14 +137,7 @@ class LiveImagesPhase(PhaseBase): if 'ksurl' in data: cmd['ksurl'] = resolve_git_url(data['ksurl']) - 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", [])) - cmd['repos'].extend(self._get_extra_repos(arch, variant, data.get('repo_from', []))) + cmd["repos"] = self._get_repos(arch, variant, data) # Explicit name and version cmd["name"] = data.get("name", None)