commit:     e31d6813d5f1cdd133726add02383c444a3f17ff
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Wed Aug 21 21:40:10 2019 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 08:43:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e31d6813

make.conf: clarify distlocks usage

The current text makes it sound like distlocks control mutual access
in more scenarios than it actually does.  Clarify that it only shows
up for distfiles & binpkgs.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 man/make.conf.5 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 9dcd35b2c..71165bc53 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -399,9 +399,13 @@ Enable portage support for the distcc package with pump 
mode.
 .TP
 .B distlocks
 Portage uses lockfiles to ensure competing instances don't clobber
-each other's files. This feature is enabled by default but may cause
+each other's files.  It covers saving distfiles to ${DISTDIR} and
+binpkgs to ${PKGDIR}.
+
+This feature is enabled by default but may cause
 heartache on less intelligent remote filesystems like NFSv2 and some
-strangely configured Samba server (oplocks off, NFS re\-export). A tool
+strangely configured Samba servers (oplocks off, NFS re\-export).
+
 /usr/lib/portage/bin/clean_locks exists to help handle lock issues
 when a problem arises (normally due to a crash or disconnect).
 .TP

Reply via email to