Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 148870
Collapse All | Expand All

(-)a/bin/emerge (-6 / +12 lines)
Lines 201-207 options=[ Link Here
201
"--tree",
201
"--tree",
202
"--update",       
202
"--update",       
203
"--usepkg",       "--usepkgonly",
203
"--usepkg",       "--usepkgonly",
204
"--verbose",      "--version"
204
"--verbose",      "--version",
205
"--without-bdeps"
205
]
206
]
206
207
207
shortmapping={
208
shortmapping={
Lines 842-853 class depgraph: Link Here
842
		for i in xrange(len(depkeys)):
843
		for i in xrange(len(depkeys)):
843
			edepend[depkeys[i]] = depvalues[i]
844
			edepend[depkeys[i]] = depvalues[i]
844
845
845
		if mytype == "binary":
846
		if mytype == "ebuild":
846
			edepend["DEPEND"] = ""
847
		elif mytype == "ebuild":
848
			if "--buildpkgonly" in self.myopts:
847
			if "--buildpkgonly" in self.myopts:
849
				edepend["RDEPEND"] = ""
848
				edepend["RDEPEND"] = ""
850
				edepend["PDEPEND"] = ""
849
				edepend["PDEPEND"] = ""
850
		if "--without-bdeps" in self.myopts and \
851
			(mytype == "binary" or mybigkey[3] == "nomerge"):
852
			edepend["DEPEND"] = ""
851
853
852
		""" We have retrieve the dependency information, now we need to recursively
854
		""" We have retrieve the dependency information, now we need to recursively
853
		    process them.  DEPEND gets processed for root = "/", {R,P}DEPEND in myroot. """
855
		    process them.  DEPEND gets processed for root = "/", {R,P}DEPEND in myroot. """
Lines 3399-3406 def action_depclean(settings, trees, ldp Link Here
3399
			spinner.update()
3401
			spinner.update()
3400
			fakedb.cpv_inject(pkg)
3402
			fakedb.cpv_inject(pkg)
3401
			mydb = portdb.xmatch("match-visible", "="+pkg) and portdb or vardb
3403
			mydb = portdb.xmatch("match-visible", "="+pkg) and portdb or vardb
3402
			depstr = " ".join(mydb.aux_get(pkg,
3404
			if "--without-bdeps" in myopts:
3403
				["DEPEND", "RDEPEND", "PDEPEND"]))
3405
				depstr = " ".join(mydb.aux_get(pkg,
3406
					["RDEPEND", "PDEPEND"]))
3407
			else:
3408
				depstr = " ".join(mydb.aux_get(pkg,
3409
					["DEPEND", "RDEPEND", "PDEPEND"]))
3404
			usedef = vardb.aux_get(pkg, ["USE"])[0].split()
3410
			usedef = vardb.aux_get(pkg, ["USE"])[0].split()
3405
			success, atoms = portage.dep_check(depstr, emptydb, settings,
3411
			success, atoms = portage.dep_check(depstr, emptydb, settings,
3406
				myuse=usedef, trees=trees, myroot=settings["ROOT"])
3412
				myuse=usedef, trees=trees, myroot=settings["ROOT"])

Return to bug 148870