From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9DED21382C5 for ; Thu, 1 Feb 2018 20:51:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 012B7E0ACF; Thu, 1 Feb 2018 20:51:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5170E0ACF for ; Thu, 1 Feb 2018 20:51:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA72A335C6A for ; Thu, 1 Feb 2018 20:51:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F1381D0 for ; Thu, 1 Feb 2018 20:51:25 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1517518264.0101a29d90bb438c28c00e6994d8a6cd2e97aa82.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0101a29d90bb438c28c00e6994d8a6cd2e97aa82 X-VCS-Branch: master Date: Thu, 1 Feb 2018 20:51:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: be7cd25d-2b3e-44d5-93bf-76abaf1855f0 X-Archives-Hash: 22b44e98e85272a4243f9cfffe301eeb commit: 0101a29d90bb438c28c00e6994d8a6cd2e97aa82 Author: Michał Górny gentoo org> AuthorDate: Thu Feb 1 20:24:10 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Feb 1 20:51:04 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0101a29d repository.config: Fix handling sync-openpgp-key-path Fix sync-openpgp-key-path to be correctly inherited from system repos.conf and preserved in repo dumps. Bug: https://bugs.gentoo.org/646314 Reviewed-by: Zac Medico gentoo.org> pym/portage/repository/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index a71047d9b..52f44d526 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -522,6 +522,7 @@ class RepoConfigLoader(object): 'clone_depth', 'eclass_overrides', 'force', 'masters', 'priority', 'strict_misc_digests', 'sync_depth', 'sync_hooks_only_on_change', + 'sync_openpgp_key_path', 'sync_type', 'sync_umask', 'sync_uri', 'sync_user', 'module_specific_options'): v = getattr(repos_conf_opts, k, None) @@ -944,7 +945,7 @@ class RepoConfigLoader(object): def config_string(self): bool_keys = ("strict_misc_digests",) str_or_int_keys = ("auto_sync", "clone_depth", "format", "location", - "main_repo", "priority", "sync_depth", + "main_repo", "priority", "sync_depth", "sync_openpgp_key_path", "sync_type", "sync_umask", "sync_uri", 'sync_user') str_tuple_keys = ("aliases", "eclass_overrides", "force") repo_config_tuple_keys = ("masters",)