summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-02 01:48:53 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-02 01:48:53 +0000
commit64c6caf986cb15c76f8f76341893decffc3aa7a2 (patch)
treefaa14626b1093856cbb98117ef351c63df8adbc1 /bin
parentRemove unnecessary print statement reported by solar. (trunk r6124:6125) (diff)
downloadportage-multirepo-64c6caf986cb15c76f8f76341893decffc3aa7a2.tar.gz
portage-multirepo-64c6caf986cb15c76f8f76341893decffc3aa7a2.tar.bz2
portage-multirepo-64c6caf986cb15c76f8f76341893decffc3aa7a2.zip
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
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index e88a7fc1..b9c49d6d 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")