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