| 1 |
commit: c34924a3f474025d8434caec7ab1ec542daa4c6a |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 1 20:22:58 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 1 20:50:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c34924a3 |
| 7 |
|
| 8 |
openpgp_key_path -> sync_openpgp_key_path |
| 9 |
|
| 10 |
Rename the openpgp_key_path attribute to sync_openpgp_key_path since |
| 11 |
Portage code assumes that attribute name matches config key. |
| 12 |
|
| 13 |
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org> |
| 14 |
|
| 15 |
pym/portage/repository/config.py | 6 +++--- |
| 16 |
pym/portage/sync/modules/rsync/rsync.py | 4 ++-- |
| 17 |
2 files changed, 5 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
| 20 |
index d3a622f7c..a71047d9b 100644 |
| 21 |
--- a/pym/portage/repository/config.py |
| 22 |
+++ b/pym/portage/repository/config.py |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 2010-2017 Gentoo Foundation |
| 25 |
+# Copyright 2010-2018 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
from __future__ import unicode_literals |
| 29 |
@@ -86,7 +86,7 @@ class RepoConfig(object): |
| 30 |
'sync_type', 'sync_umask', 'sync_uri', 'sync_user', 'thin_manifest', |
| 31 |
'update_changelog', '_eapis_banned', '_eapis_deprecated', |
| 32 |
'_masters_orig', 'module_specific_options', 'manifest_required_hashes', |
| 33 |
- 'openpgp_key_path', |
| 34 |
+ 'sync_openpgp_key_path', |
| 35 |
) |
| 36 |
|
| 37 |
def __init__(self, name, repo_opts, local_config=True): |
| 38 |
@@ -183,7 +183,7 @@ class RepoConfig(object): |
| 39 |
self.strict_misc_digests = repo_opts.get( |
| 40 |
'strict-misc-digests', 'true').lower() == 'true' |
| 41 |
|
| 42 |
- self.openpgp_key_path = repo_opts.get( |
| 43 |
+ self.sync_openpgp_key_path = repo_opts.get( |
| 44 |
'sync-openpgp-key-path', None) |
| 45 |
|
| 46 |
self.module_specific_options = {} |
| 47 |
|
| 48 |
diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py |
| 49 |
index e2e6d0658..4471f5bbe 100644 |
| 50 |
--- a/pym/portage/sync/modules/rsync/rsync.py |
| 51 |
+++ b/pym/portage/sync/modules/rsync/rsync.py |
| 52 |
@@ -277,8 +277,8 @@ class RsyncSync(NewBase): |
| 53 |
# if synced successfully, verify now |
| 54 |
if exitcode == 0 and not local_state_unchanged and self.verify_metamanifest: |
| 55 |
command = ['gemato', 'verify', '-s', self.repo.location] |
| 56 |
- if self.repo.openpgp_key_path is not None: |
| 57 |
- command += ['-K', self.repo.openpgp_key_path] |
| 58 |
+ if self.repo.sync_openpgp_key_path is not None: |
| 59 |
+ command += ['-K', self.repo.sync_openpgp_key_path] |
| 60 |
if self.verify_jobs is not None: |
| 61 |
command += ['-j', self.verify_jobs] |
| 62 |
try: |
Archives