Attachment #120604 for bug #179870





	if operator is None:
		for x in candidate_list:
			if dep_getkey(x) != mycpv:
			if xs is None:
				xcpv = dep_getcpv(x)
				if slot is not None:
					xslot = dep_getslot(x)
					if xslot is not None and xslot != slot:
						"""  This function isn't given enough information to
						reject atoms based on slot unless *both* compared atoms
						specify slots."""
						continue
				if xcpv != mycpv:
					continue
			elif xs[0] != mycpv:
				continue
			mylist.append(x)


	else:
		raise KeyError("Unknown operator: %s" % mydep)

	if slot is not None:
		candidate_list = mylist
		mylist = []
		for x in candidate_list:
			xslot = dep_getslot(x)
			if xslot is not None and xslot != slot:
				continue
			mylist.append(x)

	_match_from_list_cache[cache_key] = mylist
	return mylist

Lines 1724-1730 Link Here

(-)pym/portage.py (-1 / +4 lines)
1724	oldpuse = self.puse	1724	oldpuse = self.puse
1725	self.puse = ""	1725	self.puse = ""
1726	if self.pusedict.has_key(cp):	1726	if self.pusedict.has_key(cp):
1727	self.pusekey = best_match_to_list(self.mycpv, self.pusedict[cp].keys())	1727	cpv_slot = self.mycpv
		1728	if mydb:
		1729	cpv_slot += ":" + mydb.aux_get(self.mycpv, ["SLOT"])[0]
		1730	self.pusekey = best_match_to_list(cpv_slot, self.pusedict[cp].keys())
1728	if self.pusekey:	1731	if self.pusekey:
1729	self.puse = " ".join(self.pusedict[cp][self.pusekey])	1732	self.puse = " ".join(self.pusedict[cp][self.pusekey])
1730	if oldpuse != self.puse:	1733	if oldpuse != self.puse:

Return to bug 179870

Lines 568-586 Link Here

(-)pym/portage_dep.py (-13 / +10 lines)
568		568
569	if operator is None:	569	if operator is None:
570	for x in candidate_list:	570	for x in candidate_list:
571	xs = pkgsplit(x)	571	if dep_getkey(x) != mycpv:
572	if xs is None:
573	xcpv = dep_getcpv(x)
574	if slot is not None:
575	xslot = dep_getslot(x)
576	if xslot is not None and xslot != slot:
577	""" This function isn't given enough information to
578	reject atoms based on slot unless both compared atoms
579	specify slots."""
580	continue
581	if xcpv != mycpv:
582	continue
583	elif xs[0] != mycpv:
584	continue	572	continue
585	mylist.append(x)	573	mylist.append(x)
586		574
Lines 643-647 Link Here
643	else:	631	else:
644	raise KeyError("Unknown operator: %s" % mydep)	632	raise KeyError("Unknown operator: %s" % mydep)
645		633
		634	if slot is not None:
		635	candidate_list = mylist
		636	mylist = []
		637	for x in candidate_list:
		638	xslot = dep_getslot(x)
		639	if xslot is not None and xslot != slot:
		640	continue
		641	mylist.append(x)
		642
646	_match_from_list_cache[cache_key] = mylist	643	_match_from_list_cache[cache_key] = mylist
647	return mylist	644	return mylist