[gentoo-commits] portage r12240 - main/branches/2.1.6/pym/portage/dbapi

[gentoo-commits] portage r12240 - main/branches/2.1.6/pym/portage/dbapi

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-12-12 21:49:20 +0000 (Fri, 12 Dec 2008)
New Revision: 12240

Modified:
   main/branches/2.1.6/pym/portage/dbapi/bintree.py
Log:
When using the old binhost protocol, comparison with the remote
package isn't supported, so the local package is always preferred
even if --getbinpkgonly is enabled. Simplify bintree.isremote()
so it works the same way regardless of which protocol is used. (trunk r12209)

Modified: main/branches/2.1.6/pym/portage/dbapi/bintree.py
===================================================================
--- main/branches/2.1.6/pym/portage/dbapi/bintree.py	2008-12-12 21:48:56 UTC (rev 12239)
+++ main/branches/2.1.6/pym/portage/dbapi/bintree.py	2008-12-12 21:49:20 UTC (rev 12240)
@@ -741,8 +741,10 @@
 				mycat = self.remotepkgs[mypkg]["CATEGORY"].strip()
 				fullpkg = mycat+"/"+mypkg[:-5]
 
-				if not getbinpkgsonly and fullpkg in metadata:
-					# Local package overrides the remote one.
+				if fullpkg in metadata:
+					# When using this old protocol, comparison with the remote
+					# package isn't supported, so the local package is always
+					# preferred even if getbinpkgsonly is enabled.
 					continue
 
 				if not self.dbapi._category_re.match(mycat):
@@ -1011,14 +1013,8 @@
 		downloaded (or it is only partially downloaded)."""
 		if self._remotepkgs is None or pkgname not in self._remotepkgs:
 			return False
-		if self._remote_has_index:
-			# Presence in self._remotepkgs implies that it's remote. When a
-			# package is downloaded, state is updated by self.inject().
-			return True
-		pkg_path = self.getname(pkgname)
-		if os.path.exists(pkg_path) and \
-			os.path.basename(pkg_path) not in self.invalids:
-			return False
+		# Presence in self._remotepkgs implies that it's remote. When a
+		# package is downloaded, state is updated by self.inject().
 		return True
 
 	def get_use(self, pkgname):