From: Felix Bier <Felix.Bier@rohde-schwarz.com>
To: "gentoo-catalyst@lists.gentoo.org" <gentoo-catalyst@lists.gentoo.org>
Subject: [gentoo-catalyst] [PATCH 1/5] Rename config option 'repos' -> 'repos_storedir'
Date: Thu, 4 Feb 2021 00:34:14 +0000 [thread overview]
Message-ID: <b7a9f9130d561c45e044e9b8349b33966a6eebe6.camel@rohde-schwarz.com> (raw)
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@rohde-schwarz.com>
---
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*::
--
2.30.0
reply other threads:[~2021-02-04 0:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b7a9f9130d561c45e044e9b8349b33966a6eebe6.camel@rohde-schwarz.com \
--to=felix.bier@rohde-schwarz.com \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox