Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/repository/
Date: Sat, 27 Feb 2021 01:28:54
Message-Id: 1614389227.396b1ea5a7a0f868abe6b0b08352243f8fd48f35.zmedico@gentoo
1 commit: 396b1ea5a7a0f868abe6b0b08352243f8fd48f35
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 27 01:26:06 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 01:27:07 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=396b1ea5
7
8 RepoConfig.config_string: don't override repos with aliases (bug 749333)
9
10 Bug: https://bugs.gentoo.org/749333
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 lib/portage/repository/config.py | 2 ++
14 1 file changed, 2 insertions(+)
15
16 diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py
17 index f7c956dd8..83e9746d1 100644
18 --- a/lib/portage/repository/config.py
19 +++ b/lib/portage/repository/config.py
20 @@ -1076,6 +1076,8 @@ class RepoConfigLoader:
21 keys = bool_keys + str_or_int_keys + str_tuple_keys + repo_config_tuple_keys
22 config_string = ""
23 for repo_name, repo in sorted(self.prepos.items(), key=lambda x: (x[0] != "DEFAULT", x[0])):
24 + if repo_name != repo.name:
25 + continue
26 config_string += "\n[%s]\n" % repo_name
27 for key in sorted(keys):
28 if key == "main_repo" and repo_name != "DEFAULT":