From: Zac Medico Date: Wed, 27 Mar 2013 05:19:02 +0000 (-0700) Subject: _autounmask_levels: refactor (no behavior change) X-Git-Tag: v2.2.0_alpha170~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80937b9c751d20b33babe1e78e874057088df31c;p=portage.git _autounmask_levels: refactor (no behavior change) --- diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index dceae52f7..2b368535d 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4351,15 +4351,12 @@ class depgraph(object): 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) + autounmask_level.allow_unstable_keywords = True + yield autounmask_level - for missing_keyword, unmask in ((False,False), (True, False), (False, True), (True, True)): + if not autounmask_keep_masks: - if (only_use_changes or autounmask_keep_masks) and (missing_keyword or unmask): - break + for missing_keyword, unmask in ((True, False), (False, True), (True, True)): autounmask_level.allow_missing_keywords = missing_keyword autounmask_level.allow_unmasks = unmask