Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: man/, lib/portage/sync/modules/webrsync/
Date: Sat, 28 Jul 2018 06:13:05
Message-Id: 1532757187.ec35cb530d14885d99a7c10ae5a50bf27e6d8495.zmedico@gentoo
1 commit: ec35cb530d14885d99a7c10ae5a50bf27e6d8495
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 27 06:19:33 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 28 05:53:07 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ec35cb53
7
8 webrsync: support sync-webrsync-keep-snapshots
9
10 Add a repos.conf sync-webrsync-keep-snapshots setting that enables
11 the emerge-webrsync --keep option, which keeps snapshots in DISTDIR
12 instead of deleting them.
13
14 Reviewed-by: Brian Dolbec <dolsen <AT> gentoo.org>
15
16 lib/portage/sync/modules/webrsync/__init__.py | 1 +
17 man/portage.5 | 3 +++
18 2 files changed, 4 insertions(+)
19
20 diff --git a/lib/portage/sync/modules/webrsync/__init__.py b/lib/portage/sync/modules/webrsync/__init__.py
21 index 1e09d1a47..118e752de 100644
22 --- a/lib/portage/sync/modules/webrsync/__init__.py
23 +++ b/lib/portage/sync/modules/webrsync/__init__.py
24 @@ -46,6 +46,7 @@ module_spec = {
25 },
26 'validate_config': CheckSyncConfig,
27 'module_specific_options': (
28 + 'sync-webrsync-keep-snapshots',
29 'sync-webrsync-verify-signature',
30 ),
31 },
32
33 diff --git a/man/portage.5 b/man/portage.5
34 index 8ebf980f5..4cb1b0b34 100644
35 --- a/man/portage.5
36 +++ b/man/portage.5
37 @@ -1128,6 +1128,9 @@ when 0. Defaults to disabled.
38 Require the repository to contain a signed MetaManifest and verify
39 it using \fBapp\-portage/gemato\fR. Defaults to no.
40 .TP
41 +.B sync\-webrsync\-keep\-snapshots = true|false
42 +Keep snapshots in \fBDISTDIR\fR (do not delete). Defaults to false.
43 +.TP
44 .B sync\-webrsync\-verify\-signature = true|false
45 Require the detached tarball signature to contain a good OpenPGP
46 signature. This uses the OpenPGP key(ring) specified by the