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