Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 180009 | Differences between
and this patch

Collapse All | Expand All

(-)bin/emerge (-2 / +10 lines)
Lines 3945-3950 Link Here
3945
		del content
3945
		del content
3946
3946
3947
		try:
3947
		try:
3948
			rsync_initial_timeout = \
3949
				int(settings.get("PORTAGE_RSYNC_INITIAL_TIMEOUT", "15"))
3950
		except ValueError:
3951
			rsync_initial_timeout = 15
3952
3953
		try:
3948
			if settings.has_key("RSYNC_RETRIES"):
3954
			if settings.has_key("RSYNC_RETRIES"):
3949
				print yellow("WARNING:")+" usage of RSYNC_RETRIES is deprecated, use PORTAGE_RSYNC_RETRIES instead"
3955
				print yellow("WARNING:")+" usage of RSYNC_RETRIES is deprecated, use PORTAGE_RSYNC_RETRIES instead"
3950
				maxretries=int(settings["RSYNC_RETRIES"])				
3956
				maxretries=int(settings["RSYNC_RETRIES"])				
Lines 4054-4067 Link Here
4054
					# Timeout here in case the server is unresponsive.  The
4060
					# Timeout here in case the server is unresponsive.  The
4055
					# --timeout rsync option doesn't apply to the initial
4061
					# --timeout rsync option doesn't apply to the initial
4056
					# connection attempt.
4062
					# connection attempt.
4057
					signal.alarm(15)
4063
					if rsync_initial_timeout:
4064
						signal.alarm(rsync_initial_timeout)
4058
					try:
4065
					try:
4059
						mypids.extend(portage_exec.spawn(
4066
						mypids.extend(portage_exec.spawn(
4060
							mycommand, env=settings.environ(), returnpid=True))
4067
							mycommand, env=settings.environ(), returnpid=True))
4061
						exitcode = os.waitpid(mypids[0], 0)[1]
4068
						exitcode = os.waitpid(mypids[0], 0)[1]
4062
						content = portage.grabfile(tmpservertimestampfile)
4069
						content = portage.grabfile(tmpservertimestampfile)
4063
					finally:
4070
					finally:
4064
						signal.alarm(0)
4071
						if rsync_initial_timeout:
4072
							signal.alarm(0)
4065
						try:
4073
						try:
4066
							os.unlink(tmpservertimestampfile)
4074
							os.unlink(tmpservertimestampfile)
4067
						except OSError:
4075
						except OSError:
(-)man/make.conf.5 (+6 lines)
Lines 357-362 Link Here
357
it will increment it.  For more information about nice levels and what
357
it will increment it.  For more information about nice levels and what
358
are acceptable ranges, see \fBnice\fR(1).
358
are acceptable ranges, see \fBnice\fR(1).
359
.TP
359
.TP
360
\fBPORTAGE_RSYNC_INITIAL_TIMEOUT\fR = \fIinteger\fR
361
Used by \fBemerge \-\-sync\fR as a timeout for the initial connection to an
362
rsync server.
363
.br
364
Defaults to 15 seconds.
365
.TP
360
\fBPORTAGE_RSYNC_EXTRA_OPTS\fR = \fI[rsync options string]\fR
366
\fBPORTAGE_RSYNC_EXTRA_OPTS\fR = \fI[rsync options string]\fR
361
Additional rsync options to be used by \fBemerge \-\-sync\fR.
367
Additional rsync options to be used by \fBemerge \-\-sync\fR.
362
.br
368
.br

Return to bug 180009