diff options
| -rw-r--r-- | pym/_emerge/depgraph.py | 16 |
1 files changed, 16 insertions, 0 deletions
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("+"): |