| 1 |
Author: zmedico |
| 2 |
Date: 2008-02-10 01:50:52 +0000 (Sun, 10 Feb 2008) |
| 3 |
New Revision: 9321 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #209144 - For emerge --sync, show an informative error and don't |
| 9 |
return 1 when PORTAGE_RSYNC_RETRIES is exceeded. |
| 10 |
|
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2008-02-10 01:39:55 UTC (rev 9320) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-02-10 01:50:52 UTC (rev 9321) |
| 17 |
@@ -5570,6 +5570,7 @@ |
| 18 |
family = socket.AF_INET6 |
| 19 |
ips=[] |
| 20 |
SERVER_OUT_OF_DATE = -1 |
| 21 |
+ EXCEEDED_MAX_RETRIES = -2 |
| 22 |
while (1): |
| 23 |
if ips: |
| 24 |
del ips[0] |
| 25 |
@@ -5737,12 +5738,17 @@ |
| 26 |
# over retries |
| 27 |
# exit loop |
| 28 |
updatecache_flg=False |
| 29 |
+ exitcode = EXCEEDED_MAX_RETRIES |
| 30 |
break |
| 31 |
|
| 32 |
if (exitcode==0): |
| 33 |
emergelog(xterm_titles, "=== Sync completed with %s" % dosyncuri) |
| 34 |
elif exitcode == SERVER_OUT_OF_DATE: |
| 35 |
sys.exit(1) |
| 36 |
+ elif exitcode == EXCEEDED_MAX_RETRIES: |
| 37 |
+ sys.stderr.write( |
| 38 |
+ ">>> Exceeded PORTAGE_RSYNC_RETRIES: %s\n" % maxretries) |
| 39 |
+ sys.exit(1) |
| 40 |
elif (exitcode>0): |
| 41 |
print |
| 42 |
if exitcode==1: |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives