Gentoo Archives: gentoo-catalyst

From: Felix Bier <Felix.Bier@×××××××××××××.com>
To: "gentoo-catalyst@l.g.o" <gentoo-catalyst@l.g.o>
Subject: [gentoo-catalyst] [PATCH 1/5] Rename config option 'repos' -> 'repos_storedir'
Date: Thu, 04 Feb 2021 00:34:24
Message-Id: b7a9f9130d561c45e044e9b8349b33966a6eebe6.camel@rohde-schwarz.com
1 This commit renames the config option 'repos' to 'repos_storedir'.
2 This is done as preparation for renaming 'portage_overlay' to 'repos'.
3
4 Signed-off-by: Felix Bier <felix.bier@×××××××××××××.com>
5 ---
6 catalyst/defaults.py | 4 ++--
7 catalyst/targets/snapshot.py | 2 +-
8 doc/catalyst-config.5.txt | 4 ++--
9 3 files changed, 5 insertions(+), 5 deletions(-)
10
11 diff --git a/catalyst/defaults.py b/catalyst/defaults.py
12 index 3f12b8d5..3d5c0a7f 100644
13 --- a/catalyst/defaults.py
14 +++ b/catalyst/defaults.py
15 @@ -20,7 +20,7 @@ valid_config_file_values = frozenset([
16 "port_logdir",
17 "repo_basedir",
18 "repo_name",
19 - "repos",
20 + "repos_storedir",
21 "sharedir",
22 "storedir",
23 "target_distdir",
24 @@ -46,7 +46,7 @@ confdefaults = {
25 "port_tmpdir": "/var/tmp/portage",
26 "repo_basedir": "/var/db/repos",
27 "repo_name": "gentoo",
28 - "repos": "%(storedir)s/repos",
29 + "repos_storedir": "%(storedir)s/repos",
30 "sharedir": "/usr/share/catalyst",
31 "shdir": "%(sharedir)s/targets",
32 "storedir": "/var/tmp/catalyst",
33 diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
34 index 6b727600..b494575a 100644
35 --- a/catalyst/targets/snapshot.py
36 +++ b/catalyst/targets/snapshot.py
37 @@ -27,7 +27,7 @@ class snapshot(TargetBase):
38 TargetBase.__init__(self, myspec, addlargs)
39
40 self.git = command('git')
41 - self.ebuild_repo = Path(self.settings['repos'],
42 + self.ebuild_repo = Path(self.settings['repos_storedir'],
43 self.settings['repo_name']).with_suffix('.git')
44 self.gitdir = str(self.ebuild_repo)
45
46 diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
47 index 570d42c2..ebd99b55 100644
48 --- a/doc/catalyst-config.5.txt
49 +++ b/doc/catalyst-config.5.txt
50 @@ -109,7 +109,7 @@ Repository settings
51 Defines the location of your local source file repository.
52 Defaults to the host's DISTDIR.
53
54 -*repos*::
55 +*repos_storedir*::
56 The directory in which git repositories exist for use by the snapshot target.
57 Defaults to `${storedir}/repos`.
58
59 @@ -120,7 +120,7 @@ gentoo repo) and any overlays. The default location is
60
61 *repo_name*::
62 The name of the main repository (e.g. gentoo). The git repository at
63 -`${repos}/${repo_name}.git` will be used to produce the portdir sqfs
64 +`${repos_storedir}/${repo_name}.git` will be used to produce the portdir sqfs
65 snapshot.
66
67 *target_distdir*::
68 --
69 2.30.0