When suggesting solutions inside _show_circular_deps(), ignore solutions

that involve changes to use.mask or use.force settings.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index dc4c707428a2056007e0cc56dd3e9641a76c25ea..b68058af7014676a80c57cad04e8de72a648d4a5 100644 (file)
--- 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("+"):