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 |
v2: changed to support 'true' as well. |
10 |
|
11 |
diff --git a/man/portage.5 b/man/portage.5 |
12 |
index 1f6259715..d4f755f51 100644 |
13 |
--- a/man/portage.5 |
14 |
+++ b/man/portage.5 |
15 |
@@ -1086,9 +1086,9 @@ directories if appropriate. |
16 |
Number of parallel jobs to use when verifying nested Manifests. Defaults |
17 |
to the apparent number of processors. |
18 |
.TP |
19 |
-.B sync\-rsync\-verify\-metamanifest = true|false |
20 |
+.B sync\-rsync\-verify\-metamanifest = yes|no |
21 |
Require the repository to contain a signed MetaManifest and verify |
22 |
-it using \fBapp\-portage/gemato\fR. Defaults to false. |
23 |
+it using \fBapp\-portage/gemato\fR. Defaults to no. |
24 |
|
25 |
.RE |
26 |
|
27 |
diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py |
28 |
index d9d7d56f2..7c020a563 100644 |
29 |
--- a/pym/portage/sync/modules/rsync/rsync.py |
30 |
+++ b/pym/portage/sync/modules/rsync/rsync.py |
31 |
@@ -83,10 +83,11 @@ class RsyncSync(NewBase): |
32 |
self.repo.module_specific_options['sync-rsync-extra-opts'])) |
33 |
|
34 |
# Process GLEP74 verification options. |
35 |
- # Default verification to 'on' for ::gentoo, 'off' otherwise. |
36 |
+ # Default verification to 'no'; it's enabled for ::gentoo |
37 |
+ # via default repos.conf though. |
38 |
self.verify_metamanifest = ( |
39 |
self.repo.module_specific_options.get( |
40 |
- 'sync-rsync-verify-metamanifest', False)) |
41 |
+ 'sync-rsync-verify-metamanifest', 'no') in ('yes', 'true')) |
42 |
# Support overriding job count. |
43 |
self.verify_jobs = self.repo.module_specific_options.get( |
44 |
'sync-rsync-verify-jobs', None) |
45 |
-- |
46 |
2.16.1 |