From 0341c0957ee66888e2d44ac65e53895d1dd281c8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 1 Mar 2007 12:46:08 +0000 Subject: For bug #168646, don't bail out immediately when rsync detects protocol incompatibility (code 2) during fetching of the timestamp file. Retry for a better server (up to PORTAGE_RSYNC_RETRIES). (trunk r6103:6104) svn path=/main/branches/2.1.2/; revision=6105 --- bin/emerge | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 9ae4beb78..3133ae29e 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3977,8 +3977,14 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): env=settings.environ()) if exitcode in [0,1,2,3,4,11,14,20,21]: break - elif exitcode in [0,1,2,3,4,11,14,20,21]: + elif exitcode in [1,3,4,11,14,20,21]: break + else: + # Code 2 indicates protocol incompatibility, which is expected + # for servers with protocol < 29 that don't support + # --prune-empty-directories. Retry for a server that supports + # at least rsync protocol version 29 (>=rsync-2.6.7). + pass retries=retries+1 -- cgit v1.2.3-1-g7c22