| 1 |
commit: cda13bc9bb42ae1c91b317711365573a2d3695f3 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 24 19:44:54 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 24 19:46:04 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cda13bc9 |
| 7 |
|
| 8 |
repository/config.py: Fix propogation of module_specific_options (bug 561240) |
| 9 |
|
| 10 |
module_specific_options were being read in and set correctly, but, |
| 11 |
module_specific_options were not being copied over in _add_repositories(). |
| 12 |
This is a left-over from the PORTDIR_OVERLAY setting we intend to deprecate. |
| 13 |
This change copies all the options in one shot. |
| 14 |
X-Gentoo Bug: 561240 |
| 15 |
X-Gentoo bug Url: https://bugs.gentoo.org/show_bug.cgi?id=561240 |
| 16 |
X-Gentoo Title: sys-apps/portage-2.2.21 ignores PORTAGE_RSYNC_EXTRA_OPTS |
| 17 |
|
| 18 |
pym/portage/repository/config.py | 2 +- |
| 19 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
| 22 |
index f80bee6..a90a994 100644 |
| 23 |
--- a/pym/portage/repository/config.py |
| 24 |
+++ b/pym/portage/repository/config.py |
| 25 |
@@ -508,7 +508,7 @@ class RepoConfigLoader(object): |
| 26 |
'force', 'masters', 'priority', |
| 27 |
'sync_depth', |
| 28 |
'sync_type', 'sync_umask', 'sync_uri', 'sync_user', |
| 29 |
- ) + tuple(portage.sync.module_specific_options(repo)): |
| 30 |
+ 'module_specific_options'): |
| 31 |
v = getattr(repos_conf_opts, k, None) |
| 32 |
if v is not None: |
| 33 |
setattr(repo, k, v) |
Archives