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

[live-images] Rename repos_from to repo_from

Browse Source 
It should be consistent with live media and image build.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-02-22 08:48:12 +01:00
parent 33d5440a8a
commit 1044fb01f8
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/configuration.rst
View File

@ -680,7 +680,7 @@ Live Images Settings
* ``name`` (*str*) * ``name`` (*str*)
* ``version`` (*str*) * ``version`` (*str*)
* ``additional_repos`` (*list*) -- external repos specified by URL * ``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 * ``specfile`` (*str*) -- for images wrapped in RPM
* ``scratch`` (*bool*) -- only RPM-wrapped images can use scratch builds, * ``scratch`` (*bool*) -- only RPM-wrapped images can use scratch builds,
but by default this is turned off but by default this is turned off

2
pungi/phases/live_images.py
View File

@ -133,7 +133,7 @@ class LiveImagesPhase(PhaseBase):
# additional repos # additional repos
cmd["repos"].extend(data.get("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 # Explicit name and version
cmd["name"] = data.get("name", None) cmd["name"] = data.get("name", None)

4
pungi/wrappers/kojiwrapper.py
View File

@ -165,7 +165,9 @@ class KojiWrapper(object):
return cmd 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] <name> <version> <target> <arch> <kickstart-file> # Usage: koji spin-livecd [options] <name> <version> <target> <arch> <kickstart-file>
# Usage: koji spin-appliance [options] <name> <version> <target> <arch> <kickstart-file> # Usage: koji spin-appliance [options] <name> <version> <target> <arch> <kickstart-file>
# Examples: # Examples:

8
tests/test_liveimagesphase.py
View File

@ -70,7 +70,7 @@ class TestLiveImagesPhase(unittest.TestCase):
'amd64': { 'amd64': {
'kickstart': 'test.ks', 'kickstart': 'test.ks',
'additional_repos': ['http://example.com/repo/'], 'additional_repos': ['http://example.com/repo/'],
'repos_from': ['Everything'], 'repo_from': ['Everything'],
'release': None, 'release': None,
} }
}) })
@ -113,11 +113,11 @@ class TestLiveImagesPhase(unittest.TestCase):
'amd64': [{ 'amd64': [{
'kickstart': 'test.ks', 'kickstart': 'test.ks',
'additional_repos': ['http://example.com/repo/'], 'additional_repos': ['http://example.com/repo/'],
'repos_from': ['Everything'], 'repo_from': ['Everything'],
}, { }, {
'kickstart': 'another.ks', 'kickstart': 'another.ks',
'additional_repos': ['http://example.com/repo/'], 'additional_repos': ['http://example.com/repo/'],
'repos_from': ['Everything'], 'repo_from': ['Everything'],
}] }]
}) })
], ],
@ -180,7 +180,7 @@ class TestLiveImagesPhase(unittest.TestCase):
'kickstart': 'test.ks', 'kickstart': 'test.ks',
'ksurl': 'https://git.example.com/kickstarts.git?#HEAD', 'ksurl': 'https://git.example.com/kickstarts.git?#HEAD',
'additional_repos': ['http://example.com/repo/'], 'additional_repos': ['http://example.com/repo/'],
'repos_from': ['Everything'], 'repo_from': ['Everything'],
'type': 'appliance', 'type': 'appliance',
} }
}) })