|
Lines 1316-1322
Link Here
|
| 1316 |
|
1316 |
|
| 1317 |
check_config_instance(mysettings) |
1317 |
check_config_instance(mysettings) |
| 1318 |
|
1318 |
|
|
|
1319 |
custommirrors=grabdict("/etc/portage/mirrors") |
| 1320 |
|
| 1319 |
mymirrors=[] |
1321 |
mymirrors=[] |
|
|
1322 |
|
| 1323 |
# local mirrors are always added |
| 1324 |
if custommirrors.has_key("local"): |
| 1325 |
mymirrors += custommirrors["local"] |
| 1326 |
|
| 1320 |
if ("nomirror" in mysettings["RESTRICT"].split()): |
1327 |
if ("nomirror" in mysettings["RESTRICT"].split()): |
| 1321 |
# We don't add any mirrors. |
1328 |
# We don't add any mirrors. |
| 1322 |
pass |
1329 |
pass |
|
Lines 1403-1408
Link Here
|
| 1403 |
eidx = myuri.find("/", 9) |
1410 |
eidx = myuri.find("/", 9) |
| 1404 |
if eidx != -1: |
1411 |
if eidx != -1: |
| 1405 |
mirrorname = myuri[9:eidx] |
1412 |
mirrorname = myuri[9:eidx] |
|
|
1413 |
# Try user-defined mirrors first |
| 1414 |
if custommirrors.has_key(mirrorname): |
| 1415 |
for cmirr in custommirrors[mirrorname]: |
| 1416 |
filedict[myfile].append(cmirr+"/"+myuri[eidx+1:]) |
| 1417 |
# remove the mirrors we tried from the list of official mirrors |
| 1418 |
if cmirr.strip() in thirdpartymirrors[mirrorname]: |
| 1419 |
thirdpartymirrors[mirrorname].remove(cmirr) |
| 1420 |
# now try the official mirrors |
| 1406 |
if thirdpartymirrors.has_key(mirrorname): |
1421 |
if thirdpartymirrors.has_key(mirrorname): |
| 1407 |
try: |
1422 |
try: |
| 1408 |
shuffle(thirdpartymirrors[mirrorname]) |
1423 |
shuffle(thirdpartymirrors[mirrorname]) |
|
Lines 1424-1430
Link Here
|
| 1424 |
writemsg("\n") |
1439 |
writemsg("\n") |
| 1425 |
for loc in filedict[myfile]: |
1440 |
for loc in filedict[myfile]: |
| 1426 |
if listonly: |
1441 |
if listonly: |
| 1427 |
writemsg(loc+" ") |
1442 |
writemsg(loc+"\n") |
| 1428 |
continue |
1443 |
continue |
| 1429 |
try: |
1444 |
try: |
| 1430 |
mystat=os.stat(mysettings["DISTDIR"]+"/"+myfile) |
1445 |
mystat=os.stat(mysettings["DISTDIR"]+"/"+myfile) |
