Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 647076
Collapse All | Expand All

(-)a/pym/portage/dbapi/bintree.py (-2 / +15 lines)
Lines 811-817 class binarytree(object): Link Here
811
811
812
		self._remote_has_index = False
812
		self._remote_has_index = False
813
		self._remotepkgs = {}
813
		self._remotepkgs = {}
814
		for base_url in self.settings["PORTAGE_BINHOST"].split():
814
		binhosts = self.settings["PORTAGE_BINHOST"].split()
815
		# chromeos multi-binhost unique cpv logic
816
		cpv_unique = {} if len(binhosts) > 1 else None
817
		for base_url in binhosts:
815
			parsed_url = urlparse(base_url)
818
			parsed_url = urlparse(base_url)
816
			host = parsed_url.netloc
819
			host = parsed_url.netloc
817
			port = parsed_url.port
820
			port = parsed_url.port
Lines 1029-1034 class binarytree(object): Link Here
1029
				for d in pkgindex.packages:
1032
				for d in pkgindex.packages:
1030
					cpv = _pkg_str(d["CPV"], metadata=d,
1033
					cpv = _pkg_str(d["CPV"], metadata=d,
1031
						settings=self.settings)
1034
						settings=self.settings)
1035
					current_key = self.dbapi._instance_key(cpv)
1036
					if cpv_unique is not None:
1037
						previous = cpv_unique.get(cpv)
1038
						if previous is not None:
1039
							# Delete previous instance with same cpv but
1040
							# different instance key.
1041
							previous_key = self.dbapi._instance_key(previous)
1042
							if previous_key != current_key:
1043
								self.dbapi.cpv_remove(previous)
1044
								del self._remotepkgs[previous_key]
1045
						cpv_unique[cpv] = cpv
1032
					# Local package instances override remote instances
1046
					# Local package instances override remote instances
1033
					# with the same instance_key.
1047
					# with the same instance_key.
1034
					if self.dbapi.cpv_exists(cpv):
1048
					if self.dbapi.cpv_exists(cpv):
1035
- 

Return to bug 647076