diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-08 15:07:34 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-08 15:07:34 -0700 |
| commit | 3af5846c3c0c10b0cf80ca2e1921b9b7918bc277 (patch) | |
| tree | 2243e15769f3b09fb3a708525f0bea3445fde900 | |
| parent | 91b253ba2f249b19d6cc68f51cd6b909a765a715 (diff) | |
| download | portage-2.2.0_alpha136.tar.gz portage-2.2.0_alpha136.tar.bz2 portage-2.2.0_alpha136.zip | |
fetch: preserve SRC_URI order for primaryuriv2.2.0_alpha136
| -rw-r--r-- | pym/portage/package/ebuild/fetch.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 63b4c0a29..59d45be05 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -407,7 +407,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, file_uri_tuples.append((os.path.basename(myuri), myuri)) filedict = OrderedDict() - primaryuri_indexes={} primaryuri_dict = {} thirdpartymirror_uris = {} for myfile, myuri in file_uri_tuples: @@ -450,6 +449,10 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, primaryuri_dict[myfile] = primaryuris primaryuris.append(myuri) + # Order primaryuri_dict values to match that in SRC_URI. + for uris in primaryuri_dict.values(): + uris.reverse() + # Prefer thirdpartymirrors over normal mirrors in cases when # the file does not yet exist on the normal mirrors. for myfile, uris in thirdpartymirror_uris.items(): |