Attachment #98186 for bug #147766

Lines 3367-3373 Link Here

(-)pym/portage.py (-9 / +34 lines)
3367	return 1	3367	return 1
3368		3368
3369	def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None,	3369	def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None,
3370	return_all_deps=False):	3370	fakedb=None, return_all_deps=False):
3371	"""Takes an unreduced and reduced deplist and removes satisfied dependencies.	3371	"""Takes an unreduced and reduced deplist and removes satisfied dependencies.
3372	Returned deplist contains steps that must be taken to satisfy dependencies."""	3372	Returned deplist contains steps that must be taken to satisfy dependencies."""
3373	if trees is None:	3373	if trees is None:
Lines 3384-3390 Link Here
3384	if isinstance(dep, list):	3384	if isinstance(dep, list):
3385	unresolved += dep_zapdeps(dep, satisfied, myroot,	3385	unresolved += dep_zapdeps(dep, satisfied, myroot,
3386	use_binaries=use_binaries, trees=trees,	3386	use_binaries=use_binaries, trees=trees,
3387	return_all_deps=return_all_deps)	3387	fakedb=fakedb, return_all_deps=return_all_deps)
3388	elif not satisfied or return_all_deps:	3388	elif not satisfied or return_all_deps:
3389	unresolved.append(dep)	3389	unresolved.append(dep)
3390	return unresolved	3390	return unresolved
Lines 3403-3409 Link Here
3403	other = []	3403	other = []
3404		3404
3405	# Alias the trees we'll be checking availability against	3405	# Alias the trees we'll be checking availability against
3406	vardb = trees[myroot]["vartree"].dbapi	3406	if fakedb:
		3407	vardb = fakedb
		3408	else:
		3409	vardb = trees[myroot]["vartree"].dbapi
3407	if use_binaries:	3410	if use_binaries:
3408	mydbapi = trees[myroot]["bintree"].dbapi	3411	mydbapi = trees[myroot]["bintree"].dbapi
3409	else:	3412	else:
Lines 3414-3420 Link Here
3414	for (dep, satisfied) in zip(deps, satisfieds):	3417	for (dep, satisfied) in zip(deps, satisfieds):
3415	if isinstance(dep, list):	3418	if isinstance(dep, list):
3416	atoms = dep_zapdeps(dep, satisfied, myroot,	3419	atoms = dep_zapdeps(dep, satisfied, myroot,
3417	use_binaries=use_binaries, trees=trees)	3420	use_binaries=use_binaries, trees=trees,
		3421	fakedb=fakedb, return_all_deps=return_all_deps)
3418	else:	3422	else:
3419	atoms = [dep]	3423	atoms = [dep]
3420		3424
Lines 3555-3562 Link Here
3555	writemsg("mysplit: %s\n" % (mysplit), 1)	3559	writemsg("mysplit: %s\n" % (mysplit), 1)
3556	writemsg("mysplit2: %s\n" % (mysplit2), 1)	3560	writemsg("mysplit2: %s\n" % (mysplit2), 1)
3557		3561
		3562	fakedb = None
		3563	if return_all_deps:
		3564	fakedb = mydbapi
3558	myzaps = dep_zapdeps(mysplit, mysplit2, myroot,	3565	myzaps = dep_zapdeps(mysplit, mysplit2, myroot,
3559	use_binaries=use_binaries, trees=trees, return_all_deps=return_all_deps)	3566	use_binaries=use_binaries, trees=trees,
		3567	fakedb=fakedb, return_all_deps=return_all_deps)
3560	mylist = flatten(myzaps)	3568	mylist = flatten(myzaps)
3561	writemsg("myzaps: %s\n" % (myzaps), 1)	3569	writemsg("myzaps: %s\n" % (myzaps), 1)
3562	writemsg("mylist: %s\n" % (mylist), 1)	3570	writemsg("mylist: %s\n" % (mylist), 1)
Lines 3998-4009 Link Here
3998	def cpv_all(self):	4006	def cpv_all(self):
3999	return self.cpvdict.keys()	4007	return self.cpvdict.keys()
4000		4008
4001	def cpv_inject(self,mycpv):	4009	def cpv_inject(self, mycpv, myslot=None):
4002	"""Adds a cpv from the list of available packages."""	4010	"""Adds a cpv from the list of available packages."""
4003	mycp=cpv_getkey(mycpv)	4011	mycp=cpv_getkey(mycpv)
4004	self.cpvdict[mycpv]=1	4012	self.cpvdict[mycpv] = myslot
4005	if not self.cpdict.has_key(mycp):	4013	if myslot and mycp in self.cpdict:
4006	self.cpdict[mycp]=[]	4014	# If necessary, remove another package in the same SLOT.
		4015	for cpv in self.cpdict[mycp]:
		4016	if mycpv != cpv and myslot == self.cpvdict[cpv]:
		4017	self.cpv_remove(cpv)
		4018	break
		4019	if mycp not in self.cpdict:
		4020	self.cpdict[mycp] = []
4007	if not mycpv in self.cpdict[mycp]:	4021	if not mycpv in self.cpdict[mycp]:
4008	self.cpdict[mycp].append(mycpv)	4022	self.cpdict[mycp].append(mycpv)
4009		4023
Lines 4029-4034 Link Here
4029	if not len(self.cpdict[mycp]):	4043	if not len(self.cpdict[mycp]):
4030	del self.cpdict[mycp]	4044	del self.cpdict[mycp]
4031		4045
		4046	def aux_get(self, mycpv, wants):
		4047	if not self.cpv_exists(mycpv):
		4048	raise KeyError(mycpv)
		4049	values = []
		4050	for x in wants:
		4051	if x == "SLOT":
		4052	values.append(self.cpvdict[mycpv])
		4053	else:
		4054	values.append("")
		4055	return values
		4056
4032	class bindbapi(fakedbapi):	4057	class bindbapi(fakedbapi):
4033	def __init__(self, mybintree=None, settings=None):	4058	def __init__(self, mybintree=None, settings=None):
4034	self.bintree = mybintree	4059	self.bintree = mybintree




		self.outdatedpackages=[]
		self.mydbapi={}
		self.mydbapi["/"] = portage.fakedbapi(settings=settings)
		self.pkg_slots={"/" : {}}
		allcpv = self.trees["/"]["vartree"].getallcpv()
		if "empty" not in self.myparams or self.target_root != "/":
			for pkg in allcpv:
				myslot = self.trees["/"]["vartree"].dbapi.aux_get(pkg, ["SLOT"])[0]
				self.mydbapi["/"].cpv_inject(pkg, myslot=myslot)
			myslot = self.trees["/"]["vartree"].dbapi.aux_get(pkg, ["SLOT"])[0]
			mykey = portage.dep_getkey(pkg)
			if mykey in self.pkg_slots["/"]:
				self.pkg_slots["/"][mykey][myslot] = pkg
			else:
				self.pkg_slots["/"][mykey] = {myslot:pkg}
		if self.target_root != "/":
			self.pkg_slots[self.target_root] = {}
			allcpv = self.trees[self.target_root]["vartree"].getallcpv()
			self.mydbapi[self.target_root] = \
				portage.fakedbapi(settings=settings)
			if "empty" not in self.myparams:
				for pkg in allcpv:
					myslot = self.trees[self.target_root]["vartree"].dbapi.aux_get(pkg, ["SLOT"])[0]
					self.mydbapi[self.target_root].cpv_inject(pkg, myslot=myslot)
				myslot = self.trees[self.target_root]["vartree"].dbapi.aux_get(
					pkg, ["SLOT"])[0]
				mykey = portage.dep_getkey(pkg)
				if mykey in self.pkg_slots[self.target_root]:
					self.pkg_slots[self.target_root][mykey][myslot] = pkg
				else:
					self.pkg_slots[self.target_root][mykey] = {myslot:pkg}
		if "--usepkg" in self.myopts:
			trees["/"]["bintree"].populate(
				"--getbinpkg" in self.myopts, "--getbinpkgonly" in self.myopts)

			return 1
		else:
			mydbapi = self.trees[myroot][self.pkg_tree_map[mytype]].dbapi
			if addme:
				myslot = mydbapi.aux_get(mykey, ["SLOT"])[0]
				depkey = portage.dep_getkey(mykey)
				if depkey in self.pkg_slots:
					self.pkg_slots[myroot][depkey][myslot] = mykey
				else:
					self.pkg_slots[myroot][depkey] = {myslot : mykey}

		if myuse is None:
			self.pkgsettings[myroot].setcpv(mykey)

			if p_status == "merge":
				""" This fakedbapi data is used in dep_check calls to determine
				satisfied deps via dep_wordreduce"""
				myslot = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi.aux_get(p_key, ["SLOT"])[0]
				self.mydbapi[p_root].cpv_inject(p_key, myslot=myslot)

				# Update old-style virtuals if this package provides any.
				# These are needed for dep_virtual calls inside dep_check.

			dep_virtual calls inside dep_check."""
			mykey = portage.dep_getkey(mydep)
			valid = False
			if portage.match_from_list(mydep,
				self.mydbapi[myroot].cp_list(mykey)):
				[pkgs[myslot] for myslot in pkgs]):
				valid = True
			if not valid:
				self.digraph.remove(blocker)

Return to bug 147766

Lines 654-687 Link Here

(-)bin/emerge (-30 / +8 lines)
654	self.outdatedpackages=[]	654	self.outdatedpackages=[]
655	self.mydbapi={}	655	self.mydbapi={}
656	self.mydbapi["/"] = portage.fakedbapi(settings=settings)	656	self.mydbapi["/"] = portage.fakedbapi(settings=settings)
657	self.pkg_slots={"/" : {}}
658	allcpv = self.trees["/"]["vartree"].getallcpv()	657	allcpv = self.trees["/"]["vartree"].getallcpv()
659	if "empty" not in self.myparams or self.target_root != "/":	658	if "empty" not in self.myparams or self.target_root != "/":
660	for pkg in allcpv:	659	for pkg in allcpv:
661	self.mydbapi["/"].cpv_inject(pkg)	660	myslot = self.trees["/"]["vartree"].dbapi.aux_get(pkg, ["SLOT"])[0]
662	for pkg in allcpv:	661	self.mydbapi["/"].cpv_inject(pkg, myslot=myslot)
663	myslot = self.trees["/"]["vartree"].dbapi.aux_get(pkg, ["SLOT"])[0]
664	mykey = portage.dep_getkey(pkg)
665	if mykey in self.pkg_slots["/"]:
666	self.pkg_slots["/"][mykey][myslot] = pkg
667	else:
668	self.pkg_slots["/"][mykey] = {myslot:pkg}
669	if self.target_root != "/":	662	if self.target_root != "/":
670	self.pkg_slots[self.target_root] = {}
671	allcpv = self.trees[self.target_root]["vartree"].getallcpv()	663	allcpv = self.trees[self.target_root]["vartree"].getallcpv()
672	self.mydbapi[self.target_root] = \	664	self.mydbapi[self.target_root] = \
673	portage.fakedbapi(settings=settings)	665	portage.fakedbapi(settings=settings)
674	if "empty" not in self.myparams:	666	if "empty" not in self.myparams:
675	for pkg in allcpv:	667	for pkg in allcpv:
676	self.mydbapi[self.target_root].cpv_inject(pkg)	668	myslot = self.trees[self.target_root]["vartree"].dbapi.aux_get(pkg, ["SLOT"])[0]
677	for pkg in allcpv:	669	self.mydbapi[self.target_root].cpv_inject(pkg, myslot=myslot)
678	myslot = self.trees[self.target_root]["vartree"].dbapi.aux_get(
679	pkg, ["SLOT"])[0]
680	mykey = portage.dep_getkey(pkg)
681	if mykey in self.pkg_slots[self.target_root]:
682	self.pkg_slots[self.target_root][mykey][myslot] = pkg
683	else:
684	self.pkg_slots[self.target_root][mykey] = {myslot:pkg}
685	if "--usepkg" in self.myopts:	670	if "--usepkg" in self.myopts:
686	trees["/"]["bintree"].populate(	671	trees["/"]["bintree"].populate(
687	"--getbinpkg" in self.myopts, "--getbinpkgonly" in self.myopts)	672	"--getbinpkg" in self.myopts, "--getbinpkgonly" in self.myopts)
Lines 750-762 Link Here
750	return 1	735	return 1
751	else:	736	else:
752	mydbapi = self.trees[myroot][self.pkg_tree_map[mytype]].dbapi	737	mydbapi = self.trees[myroot][self.pkg_tree_map[mytype]].dbapi
753	if addme:
754	myslot = mydbapi.aux_get(mykey, ["SLOT"])[0]
755	depkey = portage.dep_getkey(mykey)
756	if depkey in self.pkg_slots:
757	self.pkg_slots[myroot][depkey][myslot] = mykey
758	else:
759	self.pkg_slots[myroot][depkey] = {myslot : mykey}
760		738
761	if myuse is None:	739	if myuse is None:
762	self.pkgsettings[myroot].setcpv(mykey)	740	self.pkgsettings[myroot].setcpv(mykey)
Lines 1082-1088 Link Here
1082	if p_status == "merge":	1060	if p_status == "merge":
1083	""" This fakedbapi data is used in dep_check calls to determine	1061	""" This fakedbapi data is used in dep_check calls to determine
1084	satisfied deps via dep_wordreduce"""	1062	satisfied deps via dep_wordreduce"""
1085	self.mydbapi[p_root].cpv_inject(p_key)	1063	myslot = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi.aux_get(p_key, ["SLOT"])[0]
		1064	self.mydbapi[p_root].cpv_inject(p_key, myslot=myslot)
1086		1065
1087	# Update old-style virtuals if this package provides any.	1066	# Update old-style virtuals if this package provides any.
1088	# These are needed for dep_virtual calls inside dep_check.	1067	# These are needed for dep_virtual calls inside dep_check.
Lines 1255-1263 Link Here
1255	dep_virtual calls inside dep_check."""	1234	dep_virtual calls inside dep_check."""
1256	mykey = portage.dep_getkey(mydep)	1235	mykey = portage.dep_getkey(mydep)
1257	valid = False	1236	valid = False
1258	pkgs = self.pkg_slots[myroot].get(mykey, None)	1237	if portage.match_from_list(mydep,
1259	if pkgs and portage.match_from_list(mydep,	1238	self.mydbapi[myroot].cp_list(mykey)):
1260	[pkgs[myslot] for myslot in pkgs]):
1261	valid = True	1239	valid = True
1262	if not valid:	1240	if not valid:
1263	self.digraph.remove(blocker)	1241	self.digraph.remove(blocker)