commit: d5f85bc8d71d89920332ce760e5da3dca257dc36 Author: Felix Bier <Felix.Bier <AT> rohde-schwarz <DOT> com> AuthorDate: Thu Feb 4 00:34:14 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Feb 20 02:27:06 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d5f85bc8
Rename config option 'repos' -> 'repos_storedir' This commit renames the config option 'repos' to 'repos_storedir'. This is done as preparation for renaming 'portage_overlay' to 'repos'. Signed-off-by: Felix Bier <felix.bier <AT> rohde-schwarz.com> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> catalyst/defaults.py | 4 ++-- catalyst/targets/snapshot.py | 2 +- doc/catalyst-config.5.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 3f12b8d5..3d5c0a7f 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -20,7 +20,7 @@ valid_config_file_values = frozenset([ "port_logdir", "repo_basedir", "repo_name", - "repos", + "repos_storedir", "sharedir", "storedir", "target_distdir", @@ -46,7 +46,7 @@ confdefaults = { "port_tmpdir": "/var/tmp/portage", "repo_basedir": "/var/db/repos", "repo_name": "gentoo", - "repos": "%(storedir)s/repos", + "repos_storedir": "%(storedir)s/repos", "sharedir": "/usr/share/catalyst", "shdir": "%(sharedir)s/targets", "storedir": "/var/tmp/catalyst", diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py index 6b727600..b494575a 100644 --- a/catalyst/targets/snapshot.py +++ b/catalyst/targets/snapshot.py @@ -27,7 +27,7 @@ class snapshot(TargetBase): TargetBase.__init__(self, myspec, addlargs) self.git = command('git') - self.ebuild_repo = Path(self.settings['repos'], + self.ebuild_repo = Path(self.settings['repos_storedir'], self.settings['repo_name']).with_suffix('.git') self.gitdir = str(self.ebuild_repo) diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt index 570d42c2..ebd99b55 100644 --- a/doc/catalyst-config.5.txt +++ b/doc/catalyst-config.5.txt @@ -109,7 +109,7 @@ Repository settings Defines the location of your local source file repository. Defaults to the host's DISTDIR. -*repos*:: +*repos_storedir*:: The directory in which git repositories exist for use by the snapshot target. Defaults to `${storedir}/repos`. @@ -120,7 +120,7 @@ gentoo repo) and any overlays. The default location is *repo_name*:: The name of the main repository (e.g. gentoo). The git repository at -`${repos}/${repo_name}.git` will be used to produce the portdir sqfs +`${repos_storedir}/${repo_name}.git` will be used to produce the portdir sqfs snapshot. *target_distdir*::