openpgp_key_path -> sync_openpgp_key_path
Rename the openpgp_key_path attribute to sync_openpgp_key_path since
Portage code assumes that attribute name matches config key.
Reviewed-by: Zac Medico <zmedico@gentoo.org>
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index d3a622f..a71047d 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import unicode_literals
@@ -86,7 +86,7 @@
'sync_type', 'sync_umask', 'sync_uri', 'sync_user', 'thin_manifest',
'update_changelog', '_eapis_banned', '_eapis_deprecated',
'_masters_orig', 'module_specific_options', 'manifest_required_hashes',
- 'openpgp_key_path',
+ 'sync_openpgp_key_path',
)
def __init__(self, name, repo_opts, local_config=True):
@@ -183,7 +183,7 @@
self.strict_misc_digests = repo_opts.get(
'strict-misc-digests', 'true').lower() == 'true'
- self.openpgp_key_path = repo_opts.get(
+ self.sync_openpgp_key_path = repo_opts.get(
'sync-openpgp-key-path', None)
self.module_specific_options = {}
diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py
index e2e6d06..4471f5b 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -277,8 +277,8 @@
# if synced successfully, verify now
if exitcode == 0 and not local_state_unchanged and self.verify_metamanifest:
command = ['gemato', 'verify', '-s', self.repo.location]
- if self.repo.openpgp_key_path is not None:
- command += ['-K', self.repo.openpgp_key_path]
+ if self.repo.sync_openpgp_key_path is not None:
+ command += ['-K', self.repo.sync_openpgp_key_path]
if self.verify_jobs is not None:
command += ['-j', self.verify_jobs]
try:
