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

Collapse All | Expand All

(-)bin/emerge (+22 lines)
Lines 764-769 Link Here
764
				edepend["RDEPEND"]=string.join(mytbz2.getelements("RDEPEND")," ")
764
				edepend["RDEPEND"]=string.join(mytbz2.getelements("RDEPEND")," ")
765
				edepend["PDEPEND"]=string.join(mytbz2.getelements("PDEPEND")," ")
765
				edepend["PDEPEND"]=string.join(mytbz2.getelements("PDEPEND")," ")
766
				edepend["SLOT"]   =mytbz2.getfile("SLOT",mypkgparts[2])
766
				edepend["SLOT"]   =mytbz2.getfile("SLOT",mypkgparts[2])
767
		elif mytype=="installed":
768
			myfoo = self.trees[myroot]["vartree"].dbapi.aux_get(
769
				mykey, ["RDEPEND","PDEPEND"])
770
			edepend["DEPEND"]  = ""
771
			edepend["RDEPEND"] = myfoo[0]
772
			edepend["PDEPEND"] = myfoo[1]
767
		elif mytype=="ebuild":
773
		elif mytype=="ebuild":
768
			try:
774
			try:
769
				mymeta = ["DEPEND","RDEPEND","PDEPEND"]
775
				mymeta = ["DEPEND","RDEPEND","PDEPEND"]
Lines 1025-1030 Link Here
1025
			else:
1031
			else:
1026
				#We are not processing a blocker but a normal dependency
1032
				#We are not processing a blocker but a normal dependency
1027
				myeb=None
1033
				myeb=None
1034
1035
				vdb_match = portage.best(
1036
					self.trees[myroot]["vartree"].dbapi.match(x))
1037
1038
				if vdb_match:
1039
					myk = ["installed", myroot,
1040
						self.trees[myroot]["vartree"].getebuildpath(vdb_match), "nomerge"]
1041
					if myparent:
1042
						#we are a dependency, so we want to be unconditionally added
1043
						if self.create(myk,myparent,myuse=binpkguseflags):
1044
							return 1
1045
					elif self.create(myk, myparent,
1046
						"--onlydeps" not in self.myopts,
1047
						myuse=binpkguseflags):
1048
						return 1
1049
1028
				myeb_matches = portdb.xmatch("match-visible", x)
1050
				myeb_matches = portdb.xmatch("match-visible", x)
1029
				if "--usepkgonly" not in self.myopts:
1051
				if "--usepkgonly" not in self.myopts:
1030
					myeb=portage.best(myeb_matches)
1052
					myeb=portage.best(myeb_matches)

Return to bug 48195