_autounmask_levels: refactor (no behavior change)
authorZac Medico <zmedico@gentoo.org>
Wed, 27 Mar 2013 05:19:02 +0000 (22:19 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 27 Mar 2013 05:19:02 +0000 (22:19 -0700)
pym/_emerge/depgraph.py

index dceae52f7ad5acf462bf40d26ea5cdb8e8a2b5f5..2b368535d98e96ae1a093171c2f8f17ab34598cc 100644 (file)
@@ -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