diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-01-30 19:52:19 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-01-30 20:39:20 +0100 |
| commit | 79c21efb36cb45a2586c5141abbf9e4dc65c8ac7 (patch) | |
| tree | 8d0797f83c0ead97b75d912a52c5eb057575430c | |
| parent | sync-rsync-openpgp-key-path -> generic sync-openpgp-key-path (diff) | |
| download | portage-79c21efb36cb45a2586c5141abbf9e4dc65c8ac7.tar.gz portage-79c21efb36cb45a2586c5141abbf9e4dc65c8ac7.tar.bz2 portage-79c21efb36cb45a2586c5141abbf9e4dc65c8ac7.zip | |
rsync: Fix *-verify-metamanifest boolean parsing
Fix sync-rsync-verify-metamanifest to correctly parse yes|no. Also
correct the manpage to use those two terms as they were the ones used
in repos.conf and the news item.
Reviewed-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | man/portage.5 | 4 | ||||
| -rw-r--r-- | pym/portage/sync/modules/rsync/rsync.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/man/portage.5 b/man/portage.5 index 1f6259715..d4f755f51 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -1086,9 +1086,9 @@ directories if appropriate. Number of parallel jobs to use when verifying nested Manifests. Defaults to the apparent number of processors. .TP -.B sync\-rsync\-verify\-metamanifest = true|false +.B sync\-rsync\-verify\-metamanifest = yes|no Require the repository to contain a signed MetaManifest and verify -it using \fBapp\-portage/gemato\fR. Defaults to false. +it using \fBapp\-portage/gemato\fR. Defaults to no. .RE diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py index d9d7d56f2..7c020a563 100644 --- a/pym/portage/sync/modules/rsync/rsync.py +++ b/pym/portage/sync/modules/rsync/rsync.py @@ -83,10 +83,11 @@ class RsyncSync(NewBase): self.repo.module_specific_options['sync-rsync-extra-opts'])) # Process GLEP74 verification options. - # Default verification to 'on' for ::gentoo, 'off' otherwise. + # Default verification to 'no'; it's enabled for ::gentoo + # via default repos.conf though. self.verify_metamanifest = ( self.repo.module_specific_options.get( - 'sync-rsync-verify-metamanifest', False)) + 'sync-rsync-verify-metamanifest', 'no') in ('yes', 'true')) # Support overriding job count. self.verify_jobs = self.repo.module_specific_options.get( 'sync-rsync-verify-jobs', None) |