Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: man/
Date: Wed, 11 Sep 2019 09:49:08
Message-Id: 1568191437.e31d6813d5f1cdd133726add02383c444a3f17ff.vapier@gentoo
1 commit: e31d6813d5f1cdd133726add02383c444a3f17ff
2 Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
3 AuthorDate: Wed Aug 21 21:40:10 2019 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 11 08:43:57 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e31d6813
7
8 make.conf: clarify distlocks usage
9
10 The current text makes it sound like distlocks control mutual access
11 in more scenarios than it actually does. Clarify that it only shows
12 up for distfiles & binpkgs.
13
14 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
15
16 man/make.conf.5 | 8 ++++++--
17 1 file changed, 6 insertions(+), 2 deletions(-)
18
19 diff --git a/man/make.conf.5 b/man/make.conf.5
20 index 9dcd35b2c..71165bc53 100644
21 --- a/man/make.conf.5
22 +++ b/man/make.conf.5
23 @@ -399,9 +399,13 @@ Enable portage support for the distcc package with pump mode.
24 .TP
25 .B distlocks
26 Portage uses lockfiles to ensure competing instances don't clobber
27 -each other's files. This feature is enabled by default but may cause
28 +each other's files. It covers saving distfiles to ${DISTDIR} and
29 +binpkgs to ${PKGDIR}.
30 +
31 +This feature is enabled by default but may cause
32 heartache on less intelligent remote filesystems like NFSv2 and some
33 -strangely configured Samba server (oplocks off, NFS re\-export). A tool
34 +strangely configured Samba servers (oplocks off, NFS re\-export).
35 +
36 /usr/lib/portage/bin/clean_locks exists to help handle lock issues
37 when a problem arises (normally due to a crash or disconnect).
38 .TP