From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 12 Dec 2008 00:19:46 +0000 (-0000)
Subject: Fix old-style binhost code binarytree.digestCheck() will use local digests when
X-Git-Tag: v2.2_rc18~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebd27b7b8e52c29c9f0d034ac9c88289023d8fc6;p=portage.git

Fix old-style binhost code binarytree.digestCheck() will use local digests when
a local package overrides a remote one.

svn path=/main/trunk/; revision=12208
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 0fa2db06a..7c6cd5980 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -740,6 +740,11 @@ class binarytree(object):
 					continue
 				mycat = self.remotepkgs[mypkg]["CATEGORY"].strip()
 				fullpkg = mycat+"/"+mypkg[:-5]
+
+				if not getbinpkgsonly and fullpkg in metadata:
+					# Local package overrides the remote one.
+					continue
+
 				if not self.dbapi._category_re.match(mycat):
 					writemsg(("!!! Remote binary package has an " + \
 						"unrecognized category: '%s'\n") % fullpkg,
@@ -754,10 +759,10 @@ class binarytree(object):
 					# invalid tbz2's can hurt things.
 					#print "cpv_inject("+str(fullpkg)+")"
 					self.dbapi.cpv_inject(fullpkg)
-					metadata = self.remotepkgs[mypkg]
-					for k, v in metadata.items():
-						metadata[k] = v.strip()
-					self._remotepkgs[fullpkg] = metadata
+					remote_metadata = self.remotepkgs[mypkg]
+					for k, v in remote_metadata.items():
+						remote_metadata[k] = v.strip()
+					self._remotepkgs[fullpkg] = remote_metadata
 					#print "  -- Injected"
 				except SystemExit, e:
 					raise