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.orig (-9 / +17 lines)
Lines 745-760 Link Here
745
		#self.fakedbapi.cpv_inject("sys-libs/glibc-2.3")	
745
		#self.fakedbapi.cpv_inject("sys-libs/glibc-2.3")	
746
		self.outdatedpackages=[]
746
		self.outdatedpackages=[]
747
		self.mydbapi={}
747
		self.mydbapi={}
748
		if "empty" in myparams:
748
		self.mydbapi["/"]=self.fakedbapi
749
			#for --update, we want to rebuild an entire empty tree of dependencies, and then we won't merge was is already merged.
749
		if "empty" not in myparams:
750
			self.mydbapi["/"]=self.fakedbapi
750
			for pkg in portage.db["/"]["vartree"].getallcpv():
751
		else:
751
				self.mydbapi["/"].cpv_inject(pkg)
752
			self.mydbapi["/"]=portage.db["/"]["vartree"].dbapi
753
		if portage.root!="/":
752
		if portage.root!="/":
754
			if "empty" in myparams:
753
			self.mydbapi[portage.root]=self.fakedbapi
755
				self.mydbapi[portage.root]=self.fakedbapi
754
			if "empty" not in myparams:
756
			else:
755
				for pkg in portage.db[portage.root]["vartree"].getallcpv():
757
				self.mydbapi[portage.root]=portage.db[portage.root]["vartree"].dbapi
756
					self.mydbapi[portage.root].cpv_inject(pkg)
758
			
757
			
759
		if "--usepkg" in myopts:
758
		if "--usepkg" in myopts:
760
			try:
759
			try:
Lines 823-831 Link Here
823
			merging=2
822
			merging=2
824
		if merging==1:
823
		if merging==1:
825
			mybigkey.append("merge")
824
			mybigkey.append("merge")
825
			self.mydbapi[myroot].cpv_inject(mykey)
826
		else:
826
		else:
827
			mybigkey.append("nomerge")
827
			mybigkey.append("nomerge")
828
			
828
			
829
		virts = portage.db[myroot]["porttree"].dbapi.aux_get(mykey, ["PROVIDE"])[0].split()
830
		cp = portage.dep_getkey(mykey)
831
		for virt in virts:
832
			virt = portage.dep_getkey(virt)
833
			while cp in portage.virts[virt]:
834
				portage.virts[virt].remove(cp)
835
			portage.virts[virt].insert(0, cp)
836
		
829
		# whatever the case, we need to add the node to our digraph so
837
		# whatever the case, we need to add the node to our digraph so
830
		# that children can depend upon it.
838
		# that children can depend upon it.
831
		self.digraph.addnode(string.join(mybigkey),myparent)
839
		self.digraph.addnode(string.join(mybigkey),myparent)

Return to bug 8810