From: Zac Medico Date: Fri, 2 Mar 2007 01:48:53 +0000 (-0000) Subject: Even if there's no timestamp available locally, fetch the timestamp anyway as an... X-Git-Tag: v2.1.2.1~15 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64c6caf986cb15c76f8f76341893decffc3aa7a2;p=portage.git Even if there's no timestamp available locally, fetch the timestamp anyway as an initial probe to verify that the server is responsive. This protects us from hanging indefinitely on a connection attempt to an unresponsive server which rsync's --timeout option does not prevent. (trunk r6126:6127) svn path=/main/branches/2.1.2/; revision=6128 --- diff --git a/bin/emerge b/bin/emerge index e88a7fc1d..b9c49d6d9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3922,7 +3922,12 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): exitcode = os.EX_OK servertimestamp = 0 - if mytimestamp != 0: + # Even if there's no timestamp available locally, fetch the + # timestamp anyway as an initial probe to verify that the server is + # responsive. This protects us from hanging indefinitely on a + # connection attempt to an unresponsive server which rsync's + # --timeout option does not prevent. + if True: mycommand = rsynccommand.split() mycommand.append(dosyncuri.rstrip("/") + \ "/metadata/timestamp.chk")