| 1 |
commit: 0101a29d90bb438c28c00e6994d8a6cd2e97aa82 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 1 20:24:10 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 1 20:51:04 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0101a29d |
| 7 |
|
| 8 |
repository.config: Fix handling sync-openpgp-key-path |
| 9 |
|
| 10 |
Fix sync-openpgp-key-path to be correctly inherited from system |
| 11 |
repos.conf and preserved in repo dumps. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/646314 |
| 14 |
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
pym/portage/repository/config.py | 3 ++- |
| 17 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
| 20 |
index a71047d9b..52f44d526 100644 |
| 21 |
--- a/pym/portage/repository/config.py |
| 22 |
+++ b/pym/portage/repository/config.py |
| 23 |
@@ -522,6 +522,7 @@ class RepoConfigLoader(object): |
| 24 |
'clone_depth', 'eclass_overrides', |
| 25 |
'force', 'masters', 'priority', 'strict_misc_digests', |
| 26 |
'sync_depth', 'sync_hooks_only_on_change', |
| 27 |
+ 'sync_openpgp_key_path', |
| 28 |
'sync_type', 'sync_umask', 'sync_uri', 'sync_user', |
| 29 |
'module_specific_options'): |
| 30 |
v = getattr(repos_conf_opts, k, None) |
| 31 |
@@ -944,7 +945,7 @@ class RepoConfigLoader(object): |
| 32 |
def config_string(self): |
| 33 |
bool_keys = ("strict_misc_digests",) |
| 34 |
str_or_int_keys = ("auto_sync", "clone_depth", "format", "location", |
| 35 |
- "main_repo", "priority", "sync_depth", |
| 36 |
+ "main_repo", "priority", "sync_depth", "sync_openpgp_key_path", |
| 37 |
"sync_type", "sync_umask", "sync_uri", 'sync_user') |
| 38 |
str_tuple_keys = ("aliases", "eclass_overrides", "force") |
| 39 |
repo_config_tuple_keys = ("masters",) |
Archives