fetch: preserve SRC_URI order for primaryuri

diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index 63b4c0a290e31b5a6c6e15e3f6d76ecc32764151..59d45be0589a9767dbf1ae1b5ac36223a3036c44 100644 (file)
--- 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():