Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH] rsync: Fix *-verify-metamanifest boolean parsing
Date: Tue, 30 Jan 2018 18:53:29
Message-Id: 20180130185321.30492-1-mgorny@gentoo.org
1 Fix sync-rsync-verify-metamanifest to correctly parse yes|no. Also
2 correct the manpage to use those two terms as they were the ones used
3 in repos.conf and the news item.
4 ---
5 man/portage.5 | 4 ++--
6 pym/portage/sync/modules/rsync/rsync.py | 5 +++--
7 2 files changed, 5 insertions(+), 4 deletions(-)
8
9 diff --git a/man/portage.5 b/man/portage.5
10 index 1f6259715..d4f755f51 100644
11 --- a/man/portage.5
12 +++ b/man/portage.5
13 @@ -1086,9 +1086,9 @@ directories if appropriate.
14 Number of parallel jobs to use when verifying nested Manifests. Defaults
15 to the apparent number of processors.
16 .TP
17 -.B sync\-rsync\-verify\-metamanifest = true|false
18 +.B sync\-rsync\-verify\-metamanifest = yes|no
19 Require the repository to contain a signed MetaManifest and verify
20 -it using \fBapp\-portage/gemato\fR. Defaults to false.
21 +it using \fBapp\-portage/gemato\fR. Defaults to no.
22
23 .RE
24
25 diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py
26 index d9d7d56f2..651e2d9f9 100644
27 --- a/pym/portage/sync/modules/rsync/rsync.py
28 +++ b/pym/portage/sync/modules/rsync/rsync.py
29 @@ -83,10 +83,11 @@ class RsyncSync(NewBase):
30 self.repo.module_specific_options['sync-rsync-extra-opts']))
31
32 # Process GLEP74 verification options.
33 - # Default verification to 'on' for ::gentoo, 'off' otherwise.
34 + # Default verification to 'no'; it's enabled for ::gentoo
35 + # via default repos.conf though.
36 self.verify_metamanifest = (
37 self.repo.module_specific_options.get(
38 - 'sync-rsync-verify-metamanifest', False))
39 + 'sync-rsync-verify-metamanifest', 'no') == 'yes')
40 # Support overriding job count.
41 self.verify_jobs = self.repo.module_specific_options.get(
42 'sync-rsync-verify-jobs', None)
43 --
44 2.16.1

Replies