From 11a8128ab1b2f2efc95b7a9ef72843f165fd94ae Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 18 Aug 2010 14:53:44 -0700 Subject: When suggesting solutions inside _show_circular_deps(), ignore solutions that involve changes to use.mask or use.force settings. --- pym/_emerge/depgraph.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'pym') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index dc4c70742..b68058af7 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4237,6 +4237,22 @@ class depgraph(object): if ignore_solution: continue + # Check for conflicts with use.mask and use.force. + pkgsettings = self._frozen_config.pkgsettings[parent.root] + pkgsettings.setcpv(parent) + for flag in solution: + if flag.startswith("+"): + if flag[1:] in pkgsettings.usemask: + ignore_solution = True + break + else: + if flag[1:] in pkgsettings.useforce: + ignore_solution = True + break + + if ignore_solution: + continue + changes = [] for flag in solution: if flag.startswith("+"): -- cgit v1.2.3-1-g7c22