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