_autounmask_levels: respect keywords, bug #463394

This adds an additional autounmask level which tries to respect
keywords while discarding package.mask as discussed in bug #463394.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2b368535d98e96ae1a093171c2f8f17ab34598cc..b6dd5ff6a7a6f12e5db59bf43f5b82ed7b760100 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4330,8 +4330,9 @@ class depgraph(object):
                1. USE + license
                2. USE + ~arch + license
                3. USE + ~arch + license + missing keywords
-               4. USE + ~arch + license + masks
-               5. USE + ~arch + license + missing keywords + masks
+               4. USE + license + masks
+               5. USE + ~arch + license + masks
+               6. USE + ~arch + license + missing keywords + masks
 
                Some thoughts:
                        * Do least invasive changes first.
@@ -4356,7 +4357,20 @@ class depgraph(object):
 
                if not autounmask_keep_masks:
 
-                       for missing_keyword, unmask in ((True, False), (False, True), (True, True)):
+                       autounmask_level.allow_missing_keywords = True
+                       yield autounmask_level
+
+                       # 4. USE + license + masks
+                       # Try to respect keywords while discarding
+                       # package.mask (see bug #463394).
+                       autounmask_level.allow_unstable_keywords = False
+                       autounmask_level.allow_missing_keywords = False
+                       autounmask_level.allow_unmasks = True
+                       yield autounmask_level
+
+                       autounmask_level.allow_unstable_keywords = True
+
+                       for missing_keyword, unmask in ((False, True), (True, True)):
 
                                autounmask_level.allow_missing_keywords = missing_keyword
                                autounmask_level.allow_unmasks = unmask