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

Collapse All | Expand All

(-)a/lib/_emerge/depgraph.py (+6 lines)
Lines 3861-3870 class depgraph(object): Link Here
3861
		necessary.
3861
		necessary.
3862
		"""
3862
		"""
3863
		disjunctions = []
3863
		disjunctions = []
3864
		disjunctions_appended = False
3864
		for x in dep_struct:
3865
		for x in dep_struct:
3865
			if isinstance(x, list):
3866
			if isinstance(x, list):
3866
				if x and x[0] == "||":
3867
				if x and x[0] == "||":
3867
					disjunctions.append(x)
3868
					disjunctions.append(x)
3869
					disjunctions_appended = True
3868
				else:
3870
				else:
3869
					for y in self._queue_disjunctive_deps(
3871
					for y in self._queue_disjunctive_deps(
3870
						pkg, dep_root, dep_priority, x):
3872
						pkg, dep_root, dep_priority, x):
Lines 3874-3879 class depgraph(object): Link Here
3874
				# or whatever other metadata gets implemented for this
3876
				# or whatever other metadata gets implemented for this
3875
				# purpose.
3877
				# purpose.
3876
				if x.cp.startswith('virtual/'):
3878
				if x.cp.startswith('virtual/'):
3879
					if disjunctions_appended:
3880
						self._queue_disjunction(
3881
						pkg, dep_root, dep_priority, disjunctions)
3882
						disjunctions = []
3877
					disjunctions.append(x)
3883
					disjunctions.append(x)
3878
				else:
3884
				else:
3879
					yield x
3885
					yield x

Return to bug 702806