Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 8810 | Differences between
and this patch

Collapse All | Expand All

(-)emerge (-3 / +16 lines)
Lines 749-760 Link Here
749
			#for --update, we want to rebuild an entire empty tree of dependencies, and then we won't merge was is already merged.
749
			#for --update, we want to rebuild an entire empty tree of dependencies, and then we won't merge was is already merged.
750
			self.mydbapi["/"]=self.fakedbapi
750
			self.mydbapi["/"]=self.fakedbapi
751
		else:
751
		else:
752
			self.mydbapi["/"]=portage.db["/"]["vartree"].dbapi
752
			self.mydbapi["/"]=portage.fakedbapi()
753
			for pkg in portage.db["/"]["vartree"].getallcpv():
754
				self.mydbapi["/"].cpv_inject(pkg)
753
		if portage.root!="/":
755
		if portage.root!="/":
754
			if "empty" in myparams:
756
			if "empty" in myparams:
755
				self.mydbapi[portage.root]=self.fakedbapi
757
				self.mydbapi[portage.root]=self.fakedbapi
756
			else:
758
			else:
757
				self.mydbapi[portage.root]=portage.db[portage.root]["vartree"].dbapi
759
				self.mydbapi[portage.root]=portage.fakedbapi()
760
				for pkg in portage.db[portage.root]["vartree"].getallcpv():
761
					self.mydbapi[portage.root].cpv_inject(pkg)
758
			
762
			
759
		if "--usepkg" in myopts:
763
		if "--usepkg" in myopts:
760
			try:
764
			try:
Lines 823-831 Link Here
823
			merging=2
827
			merging=2
824
		if merging==1:
828
		if merging==1:
825
			mybigkey.append("merge")
829
			mybigkey.append("merge")
830
			self.mydbapi[myroot].cpv_inject(mykey)
831
826
		else:
832
		else:
827
			mybigkey.append("nomerge")
833
			mybigkey.append("nomerge")
828
			
834
		
835
		virts = portage.db[myroot]["porttree"].dbapi.aux_get(mykey, ["PROVIDE"])[0].split()
836
		cp = portage.dep_getkey(mykey)
837
		for virt in virts:
838
			while cp in portage.virts[virt]:
839
				portage.virts[virt].remove(cp)
840
			portage.virts[virt].insert(0, cp)
841
		
829
		# whatever the case, we need to add the node to our digraph so
842
		# whatever the case, we need to add the node to our digraph so
830
		# that children can depend upon it.
843
		# that children can depend upon it.
831
		self.digraph.addnode(string.join(mybigkey),myparent)
844
		self.digraph.addnode(string.join(mybigkey),myparent)

Return to bug 8810