Attachment #92675 for bug #126748

View | Details | Raw Unified | Return to bug 126748
Collapse All | Expand All

Lines 318-323 Link Here

(-)pym/portage.py (+4 lines)
318	self.okeys=[]	318	self.okeys=[]
319		319
320	def addnode(self,mykey,myparent):	320	def addnode(self,mykey,myparent):
		321	if mykey == myparent:
		322	# Refuse to make a node depend on itself so that the caller doesn't
		323	# accidentally create a bogus circular dependency.
		324	myparent = None
321	if not self.dict.has_key(mykey):	325	if not self.dict.has_key(mykey):
322	self.okeys.append(mykey)	326	self.okeys.append(mykey)
323	if myparent is None:	327	if myparent is None:

Lines 689-698 Link Here

(-)bin/emerge (-3 / +7 lines)
689	#"no downgrade" emerge	689	#"no downgrade" emerge
690	"""	690	"""
691		691
692	jbigkey=string.join(mybigkey)	692	jbigkey = " ".join(mybigkey) + " merge"
693	# Prevent cycles where packages are already in the digraph	693	if self.digraph.hasnode(jbigkey):
694	if self.digraph.hasnode(jbigkey+" merge") or self.digraph.hasnode(jbigkey+" nomerge"):	694	if addme:
		695	self.digraph.addnode(jbigkey, myparent)
695	return 1	696	return 1
		697	jbigkey = " ".join(mybigkey) + " nomerge"
		698	if self.digraph.hasnode(jbigkey):
		699	return 1
696		700
697	self.spinner.update()	701	self.spinner.update()
698	mytype,myroot,mykey=mybigkey	702	mytype,myroot,mykey=mybigkey

Return to bug 126748