Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Jorge Manuel B . S . Vicetto" <jmbsvicetto@g.o>, Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] RepoConfig: fix make.conf PORTDIR override (bug 661276)
Date: Sun, 15 Jul 2018 21:09:41
Message-Id: 20180715210924.4666-1-zmedico@gentoo.org
1 Pass the main-repo name from repos.conf as the repository name
2 for the PORTDIR RepoConfig constructor, so that it can override
3 the main repo location even if the profiles/repo_name file does
4 not exist yet (like in a stage3 tarball).
5
6 Bug: https://bugs.gentoo.org/661276
7 Reported-by: Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
8 ---
9 pym/portage/repository/config.py | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12 diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
13 index bf2b6dd03..e45e67dec 100644
14 --- a/pym/portage/repository/config.py
15 +++ b/pym/portage/repository/config.py
16 @@ -524,7 +524,8 @@ class RepoConfigLoader(object):
17 (base_priority == 0 and ov is portdir):
18 repo_opts = default_repo_opts.copy()
19 repo_opts['location'] = ov
20 - repo = RepoConfig(None, repo_opts, local_config=local_config)
21 + name = prepos['DEFAULT'].main_repo if ov is portdir else None
22 + repo = RepoConfig(name, repo_opts, local_config=local_config)
23 # repos_conf_opts contains options from repos.conf
24 repos_conf_opts = repos_conf.get(repo.name)
25 if repos_conf_opts is not None:
26 --
27 2.13.6

Replies