From dd5b5fe7182be46e7d753a03a67369eb5ae7ec13 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sun, 19 Mar 2006 17:36:50 +0000 Subject: Add support for generic PORTAGE_RSYNC_{EXTRA_,}OPTS, deprecate existing RSYNC_ variables, rename RSYNC_RETRIES to PORTAGE_RSYNC_RETRIES svn path=/main/trunk/; revision=2955 --- man/make.conf.5 | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'man') diff --git a/man/make.conf.5 b/man/make.conf.5 index 8a56dbea2..86eb0ecf3 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -298,6 +298,24 @@ emerge is running at. In other words, this will not set the nice level, it will increment it. For more information about nice levels and what are acceptable ranges, see \fBnice\fR(1). .TP +\fBPORTAGE_RSYNC_EXTRA_OPTS\fR = \fI[rsync options string]\fR +Additional rsync options to be used by \fBemerge --sync\fR. +.br +Defaults to no value. +.TP +\fBPORTAGE_RSYNC_OPTS\fR = \fI[rsync options string]\fR +Default rsync options to be used by \fBemerge --sync\fR. +.br +\fBDon't change this unless you know exactly what you're doing!\fR +.br +Defaults to "--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude='/distfiles' --exclude='/local' --exclude='/packages'" +.TP +\fBPORTAGE_RSYNC_RETRIES\fR = \fI[NUMBER]\fR +The number of times rsync should retry on failed connections before +giving up. +.br +Defaults to 3. +.TP \fBPORTAGE_TMPDIR\fR = \fI[path]\fR Defines the location of the temporary build directories. .br @@ -330,26 +348,6 @@ images. .br Defaults to /. .TP -\fBRSYNC_EXCLUDEFROM\fR = \fI"/etc/portage/rsync_excludes"\fR -This is a file that portage will pass to rsync when it updates the portage -tree. Specific chucks of the tree may be excluded from the sync process. -This may cause dependency failures if you are not careful. The file format -is one pattern per line, blanks and ';' or '#' lines are comments. See -\fBrsync\fR(1) for more details. -.TP -\fBRSYNC_RETRIES\fR = \fI[NUMBER]\fR -The number of times rsync should retry on failed connections before -giving up. -.br -Defaults to 3. -.TP -\fBRSYNC_TIMEOUT\fR = \fI[SECONDS]\fR -The number of seconds rsync should remain idle before it determines the -connection has timed out. Dialup users may need to set this value at or -above 300 seconds. -.br -Defaults to 180 seconds. -.TP \fBRPMDIR\fR = \fI[path]\fR Defines the location where created RPM packages will be stored. .br -- cgit v1.2.3-1-g7c22