Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH 2/2] repository.config: Fix handling sync-openpgp-key-path
Date: Thu, 01 Feb 2018 20:25:41
Message-Id: 20180201202528.19023-2-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 1/2] openpgp_key_path -> sync_openpgp_key_path by "Michał Górny"
1 Fix sync-openpgp-key-path to be correctly inherited from system
2 repos.conf and preserved in repo dumps.
3
4 Bug: https://bugs.gentoo.org/646314
5 ---
6 pym/portage/repository/config.py | 3 ++-
7 1 file changed, 2 insertions(+), 1 deletion(-)
8
9 diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
10 index a71047d9b..52f44d526 100644
11 --- a/pym/portage/repository/config.py
12 +++ b/pym/portage/repository/config.py
13 @@ -522,6 +522,7 @@ class RepoConfigLoader(object):
14 'clone_depth', 'eclass_overrides',
15 'force', 'masters', 'priority', 'strict_misc_digests',
16 'sync_depth', 'sync_hooks_only_on_change',
17 + 'sync_openpgp_key_path',
18 'sync_type', 'sync_umask', 'sync_uri', 'sync_user',
19 'module_specific_options'):
20 v = getattr(repos_conf_opts, k, None)
21 @@ -944,7 +945,7 @@ class RepoConfigLoader(object):
22 def config_string(self):
23 bool_keys = ("strict_misc_digests",)
24 str_or_int_keys = ("auto_sync", "clone_depth", "format", "location",
25 - "main_repo", "priority", "sync_depth",
26 + "main_repo", "priority", "sync_depth", "sync_openpgp_key_path",
27 "sync_type", "sync_umask", "sync_uri", 'sync_user')
28 str_tuple_keys = ("aliases", "eclass_overrides", "force")
29 repo_config_tuple_keys = ("masters",)
30 --
31 2.16.1