On 01/24/2018 01:03 PM, Michał Górny wrote:
> diff --git a/pym/portage/sync/modules/rsync/rsync.py
> b/pym/portage/sync/modules/rsync/rsync.py
> index c80641ba3..f3157d093 100644
> --- a/pym/portage/sync/modules/rsync/rsync.py
> +++ b/pym/portage/sync/modules/rsync/rsync.py
> @@ -1,4 +1,4 @@
> -# Copyright 1999-2015 Gentoo Foundation
> +# Copyright 1999-2018 Gentoo Foundation
> # Distributed under the terms of the GNU General Public License v2
>
> import sys
> @@ -82,6 +82,16 @@ class RsyncSync(NewBase):
> self.extra_rsync_opts.extend(portage.util.shlex_split(
>
> self.repo.module_specific_options['sync-rsync-extra-opts']))
>
> + # Process GLEP74 verification options.
> + # Default verification to 'on' for ::gentoo, 'off' otherwise.
> + self.verify_metamanifest = (
> +
> self.repo.module_specific_options.get('sync-rsync-verify-metamanifest',
> + self.repo.name == 'gentoo'))
> + # Default to gentoo-keys keyring.
> + self.openpgp_key_path = (
> +
> self.repo.module_specific_options.get('sync-rsync-openpgp-key-path',
> +
> '/var/lib/gentoo/gkeys/keyrings/gentoo/release/pubring.gpg'))Maybe these defaults should go in cnf/repos.conf, and we should have the ebuild patch the sync-rsync-verify-metamanifest setting depending on the USE=rsync-verify state? -- Thanks, Zac
signature.asc
Description: OpenPGP digital signature
