summaryrefslogtreecommitdiffstats
path: root/pym/_emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-06-15 16:03:59 -0700
committerZac Medico <zmedico@gentoo.org>2012-06-15 16:03:59 -0700
commitb363b5342ac918f06e8752e702e68363d1388cdb (patch)
treea6fd01cce7b0bafd66ddaed7d5f48ed9ea66c4e5 /pym/_emerge
parentd1a7dc427d000f5b5e85d5dc5cfa449346bdd7d4 (diff)
downloadportage-b363b5342ac918f06e8752e702e68363d1388cdb.tar.gz
portage-b363b5342ac918f06e8752e702e68363d1388cdb.tar.bz2
portage-b363b5342ac918f06e8752e702e68363d1388cdb.zip
Add USE + license autounmask for bug #420847.
Diffstat (limited to 'pym/_emerge')
-rw-r--r--pym/_emerge/depgraph.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2e98be837..5eece9876 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3522,7 +3522,8 @@ class depgraph(object):
"""
Iterate over the different allowed things to unmask.
- 1. USE
+ 0. USE
+ 1. USE + license
2. USE + ~arch + license
3. USE + ~arch + license + missing keywords
4. USE + ~arch + license + masks
@@ -3541,8 +3542,12 @@ class depgraph(object):
autounmask_level = self._AutounmaskLevel()
autounmask_level.allow_use_changes = True
+ yield autounmask_level
- for only_use_changes in (True, False):
+ autounmask_level.allow_license_changes = True
+ yield autounmask_level
+
+ for only_use_changes in (False,):
autounmask_level.allow_unstable_keywords = (not only_use_changes)
autounmask_level.allow_license_changes = (not only_use_changes)