From 7d9ec2790d9c89a3e111fc94b7fb4a4917f74c96 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 28 May 2007 07:32:25 +0000 Subject: For bug #180009, add a PORTAGE_RSYNC_INITIAL_TIMEOUT config variable. The default is 15 seconds and it can be disabled by setting it to 0. (trunk r6650) svn path=/main/branches/2.1.2/; revision=6651 --- bin/emerge | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index eca2b24c1..7b5e6f378 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3944,6 +3944,12 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): pass del content + try: + rsync_initial_timeout = \ + int(settings.get("PORTAGE_RSYNC_INITIAL_TIMEOUT", "15")) + except ValueError: + rsync_initial_timeout = 15 + try: if settings.has_key("RSYNC_RETRIES"): print yellow("WARNING:")+" usage of RSYNC_RETRIES is deprecated, use PORTAGE_RSYNC_RETRIES instead" @@ -4054,14 +4060,16 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): # Timeout here in case the server is unresponsive. The # --timeout rsync option doesn't apply to the initial # connection attempt. - signal.alarm(15) + if rsync_initial_timeout: + signal.alarm(rsync_initial_timeout) try: mypids.extend(portage_exec.spawn( mycommand, env=settings.environ(), returnpid=True)) exitcode = os.waitpid(mypids[0], 0)[1] content = portage.grabfile(tmpservertimestampfile) finally: - signal.alarm(0) + if rsync_initial_timeout: + signal.alarm(0) try: os.unlink(tmpservertimestampfile) except OSError: -- cgit v1.2.3-1-g7c22