From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Jan 2011 02:32:18 +0000 (-0800)
Subject: binarytree: fix broken BASE_URI initialization
X-Git-Tag: v2.2.0_alpha20~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92c25530595135e400d47128bc3b37e5e1806dc5;p=portage.git

binarytree: fix broken BASE_URI initialization
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index cc6203a7d..5453622ee 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -861,9 +861,11 @@ class binarytree(object):
 			if pkgindex:
 				# Organize remote package list as a cpv -> metadata map.
 				remotepkgs = _pkgindex_cpv_map_latest_build(pkgindex)
+				remote_base_uri = pkgindex.header.get("URI", base_url)
+				for remote_metadata in remotepkgs.values():
+					remote_metadata["BASE_URI"] = remote_base_uri
 				self._remotepkgs.update(remotepkgs)
 				self._remote_has_index = True
-				remote_base_uri = pkgindex.header.get("URI", base_url)
 				for cpv in remotepkgs:
 					self.dbapi.cpv_inject(cpv)
 				if True:
@@ -874,7 +876,6 @@ class binarytree(object):
 						remote_metadata = self._remotepkgs.get(cpv)
 						if remote_metadata is None:
 							continue
-						remote_metadata["BASE_URI"] = remote_base_uri
 						# Use digests to compare identity.
 						identical = True
 						for hash_name in hash_names: