From 1044fb01f870a345b9458d29b06af97a24ba6673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 22 Feb 2016 08:48:12 +0100 Subject: [PATCH] [live-images] Rename repos_from to repo_from MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should be consistent with live media and image build. Signed-off-by: Lubomír Sedlář --- doc/configuration.rst | 2 +- pungi/phases/live_images.py | 2 +- pungi/wrappers/kojiwrapper.py | 4 +++- tests/test_liveimagesphase.py | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/configuration.rst b/doc/configuration.rst index 47f7692b..f1b4d0c8 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -680,7 +680,7 @@ Live Images Settings * ``name`` (*str*) * ``version`` (*str*) * ``additional_repos`` (*list*) -- external repos specified by URL - * ``repos_from`` (*list*) -- repos from other variants + * ``repo_from`` (*list*) -- repos from other variants * ``specfile`` (*str*) -- for images wrapped in RPM * ``scratch`` (*bool*) -- only RPM-wrapped images can use scratch builds, but by default this is turned off diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py index 9b3cbde0..620abe68 100644 --- a/pungi/phases/live_images.py +++ b/pungi/phases/live_images.py @@ -133,7 +133,7 @@ class LiveImagesPhase(PhaseBase): # additional repos cmd["repos"].extend(data.get("additional_repos", [])) - cmd['repos'].extend(self._get_extra_repos(arch, variant, data.get('repos_from', []))) + cmd['repos'].extend(self._get_extra_repos(arch, variant, data.get('repo_from', []))) # Explicit name and version cmd["name"] = data.get("name", None) diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py index 997459f7..8d44d8af 100644 --- a/pungi/wrappers/kojiwrapper.py +++ b/pungi/wrappers/kojiwrapper.py @@ -165,7 +165,9 @@ class KojiWrapper(object): return cmd - def get_create_image_cmd(self, name, version, target, arch, ks_file, repos, image_type="live", image_format=None, release=None, wait=True, archive=False, specfile=None, ksurl=None): + def get_create_image_cmd(self, name, version, target, arch, ks_file, repos, + image_type="live", image_format=None, release=None, + wait=True, archive=False, specfile=None, ksurl=None): # Usage: koji spin-livecd [options] # Usage: koji spin-appliance [options] # Examples: diff --git a/tests/test_liveimagesphase.py b/tests/test_liveimagesphase.py index 709dd544..5d870384 100755 --- a/tests/test_liveimagesphase.py +++ b/tests/test_liveimagesphase.py @@ -70,7 +70,7 @@ class TestLiveImagesPhase(unittest.TestCase): 'amd64': { 'kickstart': 'test.ks', 'additional_repos': ['http://example.com/repo/'], - 'repos_from': ['Everything'], + 'repo_from': ['Everything'], 'release': None, } }) @@ -113,11 +113,11 @@ class TestLiveImagesPhase(unittest.TestCase): 'amd64': [{ 'kickstart': 'test.ks', 'additional_repos': ['http://example.com/repo/'], - 'repos_from': ['Everything'], + 'repo_from': ['Everything'], }, { 'kickstart': 'another.ks', 'additional_repos': ['http://example.com/repo/'], - 'repos_from': ['Everything'], + 'repo_from': ['Everything'], }] }) ], @@ -180,7 +180,7 @@ class TestLiveImagesPhase(unittest.TestCase): 'kickstart': 'test.ks', 'ksurl': 'https://git.example.com/kickstarts.git?#HEAD', 'additional_repos': ['http://example.com/repo/'], - 'repos_from': ['Everything'], + 'repo_from': ['Everything'], 'type': 'appliance', } })