| 1 |
On 01/24/2018 01:03 PM, Michał Górny wrote: |
| 2 |
> diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py |
| 3 |
> index c80641ba3..f3157d093 100644 |
| 4 |
> --- a/pym/portage/sync/modules/rsync/rsync.py |
| 5 |
> +++ b/pym/portage/sync/modules/rsync/rsync.py |
| 6 |
> @@ -1,4 +1,4 @@ |
| 7 |
> -# Copyright 1999-2015 Gentoo Foundation |
| 8 |
> +# Copyright 1999-2018 Gentoo Foundation |
| 9 |
> # Distributed under the terms of the GNU General Public License v2 |
| 10 |
> |
| 11 |
> import sys |
| 12 |
> @@ -82,6 +82,16 @@ class RsyncSync(NewBase): |
| 13 |
> self.extra_rsync_opts.extend(portage.util.shlex_split( |
| 14 |
> self.repo.module_specific_options['sync-rsync-extra-opts'])) |
| 15 |
> |
| 16 |
> + # Process GLEP74 verification options. |
| 17 |
> + # Default verification to 'on' for ::gentoo, 'off' otherwise. |
| 18 |
> + self.verify_metamanifest = ( |
| 19 |
> + self.repo.module_specific_options.get('sync-rsync-verify-metamanifest', |
| 20 |
> + self.repo.name == 'gentoo')) |
| 21 |
> + # Default to gentoo-keys keyring. |
| 22 |
> + self.openpgp_key_path = ( |
| 23 |
> + self.repo.module_specific_options.get('sync-rsync-openpgp-key-path', |
| 24 |
> + '/var/lib/gentoo/gkeys/keyrings/gentoo/release/pubring.gpg')) |
| 25 |
|
| 26 |
Maybe these defaults should go in cnf/repos.conf, and we should have the |
| 27 |
ebuild patch the sync-rsync-verify-metamanifest setting depending on the |
| 28 |
USE=rsync-verify state? |
| 29 |
-- |
| 30 |
Thanks, |
| 31 |
Zac |
Archives