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

Collapse All | Expand All

(-)a/bin/emerge (-1 / +7 lines)
Lines 1077-1082 class depgraph: Link Here
1077
				selected_pkg = ["blocks", myroot, x[1:], None]
1077
				selected_pkg = ["blocks", myroot, x[1:], None]
1078
			else:
1078
			else:
1079
				#We are not processing a blocker but a normal dependency
1079
				#We are not processing a blocker but a normal dependency
1080
				pkg_key = portage.dep_getkey(x)
1081
				if pkg_key in pkgsettings.pprovideddict and \
1082
					portage.match_from_list(
1083
						x, pkgsettings.pprovideddict[pkg_key]):
1084
						continue
1085
1080
				# List of acceptable packages, ordered by type preference.
1086
				# List of acceptable packages, ordered by type preference.
1081
				matched_packages = []
1087
				matched_packages = []
1082
				myeb_matches = portdb.xmatch("match-visible", x)
1088
				myeb_matches = portdb.xmatch("match-visible", x)
Lines 1207-1213 class depgraph: Link Here
1207
		while (not mygraph.empty()):
1213
		while (not mygraph.empty()):
1208
			mycurkey=mygraph.firstzero()
1214
			mycurkey=mygraph.firstzero()
1209
			if not mycurkey:
1215
			if not mycurkey:
1210
				installables = mygraph.leaf_nodes(include_soft_deps=True)
1216
				installables = mygraph.leaf_nodes(include_soft_deps=False)
1211
				if not installables:
1217
				if not installables:
1212
					print "!!! Error: circular dependencies:"
1218
					print "!!! Error: circular dependencies:"
1213
					print
1219
					print

Return to bug 147766