diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-03-01 12:46:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-01 12:46:08 +0000 |
| commit | 0341c0957ee66888e2d44ac65e53895d1dd281c8 (patch) | |
| tree | 3c46e8aa5aa4b53fb4185894bdd6e496acb09417 | |
| parent | For bug #168823, fix broken except statement syntax that prevents the ValueEr... (diff) | |
| download | portage-multirepo-0341c0957ee66888e2d44ac65e53895d1dd281c8.tar.gz portage-multirepo-0341c0957ee66888e2d44ac65e53895d1dd281c8.tar.bz2 portage-multirepo-0341c0957ee66888e2d44ac65e53895d1dd281c8.zip | |
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
| -rwxr-xr-x | bin/emerge | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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 |