| 1 |
commit: 80937b9c751d20b33babe1e78e874057088df31c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 27 05:19:02 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 27 05:19:02 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=80937b9c |
| 7 |
|
| 8 |
_autounmask_levels: refactor (no behavior change) |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 11 ++++------- |
| 12 |
1 files changed, 4 insertions(+), 7 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index dceae52..2b36853 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -4351,15 +4351,12 @@ class depgraph(object): |
| 19 |
autounmask_level.allow_license_changes = True |
| 20 |
yield autounmask_level |
| 21 |
|
| 22 |
- for only_use_changes in (False,): |
| 23 |
- |
| 24 |
- autounmask_level.allow_unstable_keywords = (not only_use_changes) |
| 25 |
- autounmask_level.allow_license_changes = (not only_use_changes) |
| 26 |
+ autounmask_level.allow_unstable_keywords = True |
| 27 |
+ yield autounmask_level |
| 28 |
|
| 29 |
- for missing_keyword, unmask in ((False,False), (True, False), (False, True), (True, True)): |
| 30 |
+ if not autounmask_keep_masks: |
| 31 |
|
| 32 |
- if (only_use_changes or autounmask_keep_masks) and (missing_keyword or unmask): |
| 33 |
- break |
| 34 |
+ for missing_keyword, unmask in ((True, False), (False, True), (True, True)): |
| 35 |
|
| 36 |
autounmask_level.allow_missing_keywords = missing_keyword |
| 37 |
autounmask_level.allow_unmasks = unmask |
Archives