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

Collapse All | Expand All

(-)a/pym/_emerge/resolver/circular_dependency.py (-11 lines)
Lines 138-154 class circular_dependency_handler(object): Link Here
138
			usemask, useforce = self._get_use_mask_and_force(parent)
138
			usemask, useforce = self._get_use_mask_and_force(parent)
139
			autounmask_changes = self._get_autounmask_changes(parent)
139
			autounmask_changes = self._get_autounmask_changes(parent)
140
			untouchable_flags = frozenset(chain(usemask, useforce, autounmask_changes))
140
			untouchable_flags = frozenset(chain(usemask, useforce, autounmask_changes))
141
142
			affecting_use.difference_update(untouchable_flags)
141
			affecting_use.difference_update(untouchable_flags)
143
144
			#If any of the flags we're going to touch is in REQUIRED_USE, add all
145
			#other flags in REQUIRED_USE to affecting_use, to not lose any solution.
146
			required_use_flags = get_required_use_flags(parent.metadata["REQUIRED_USE"])
147
148
			if affecting_use.intersection(required_use_flags):
149
				affecting_use.update(required_use_flags)
150
				affecting_use.difference_update(untouchable_flags)
151
152
			affecting_use = tuple(affecting_use)
142
			affecting_use = tuple(affecting_use)
153
143
154
			if not affecting_use:
144
			if not affecting_use:
155
- 

Return to bug 374397