| 1 |
commit: 30ab9f5156d50fb7849dbe48f39d3d4c04256792 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 9 03:04:15 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 9 03:05:30 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=30ab9f51 |
| 7 |
|
| 8 |
RepoConfigLoader._add_repositories: discard invalid repos |
| 9 |
|
| 10 |
Invalid repos are unsafe to handle. For example, repo.name |
| 11 |
can be None. |
| 12 |
|
| 13 |
pym/portage/repository/config.py | 2 ++ |
| 14 |
1 file changed, 2 insertions(+) |
| 15 |
|
| 16 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
| 17 |
index fbc1c14..fff619f 100644 |
| 18 |
--- a/pym/portage/repository/config.py |
| 19 |
+++ b/pym/portage/repository/config.py |
| 20 |
@@ -512,6 +512,8 @@ class RepoConfigLoader(object): |
| 21 |
repo_opts = default_repo_opts.copy() |
| 22 |
repo_opts['location'] = ov |
| 23 |
repo = RepoConfig(None, repo_opts, local_config=local_config) |
| 24 |
+ if repo._invalid_config: |
| 25 |
+ continue |
| 26 |
# repos_conf_opts contains options from repos.conf |
| 27 |
repos_conf_opts = repos_conf.get(repo.name) |
| 28 |
if repos_conf_opts is not None: |
Archives