From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 9 Oct 2012 02:01:45 +0000 (-0700)
Subject: _parse_uri_map: preserve order of URIs
X-Git-Tag: v2.2.0_alpha137~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=960792b9fd0e11b16efdc0b538231288b8727862;p=portage.git

_parse_uri_map: preserve order of URIs

Returns a dict of tuples instead of a dict of sets.
---

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index dba0ef53d..a5945be59 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -1138,9 +1138,14 @@ def _parse_uri_map(cpv, metadata, use=None):
 
 		uri_set = uri_map.get(distfile)
 		if uri_set is None:
-			uri_set = set()
+			# Use OrderedDict to preserve order from SRC_URI
+			# while ensuring uniqueness.
+			uri_set = OrderedDict()
 			uri_map[distfile] = uri_set
-		uri_set.add(uri)
-		uri = None
+		uri_set[uri] = True
+
+	# Convert OrderedDicts to tuples.
+	for k, v in uri_map.items():
+		uri_map[k] = tuple(v)
 
 	return uri_map