From: Zac Medico Date: Sat, 11 Jun 2011 05:21:19 +0000 (-0700) Subject: depgraph._serialize_tasks: revert formatting diff X-Git-Tag: v2.2.0_alpha40~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9390abed8b1a7dfa47c1ee0e25d83202afccda83;p=portage.git depgraph._serialize_tasks: revert formatting diff --- diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index ca86904e6..5ad19e885 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5041,12 +5041,11 @@ class depgraph(object): if selected_nodes: break - if prefer_asap and asap_nodes: - if not selected_nodes: - # We failed to find any asap nodes to merge, - # so ignore them for the next iteration. - prefer_asap = False - continue + if prefer_asap and asap_nodes and not selected_nodes: + # We failed to find any asap nodes to merge, so ignore + # them for the next iteration. + prefer_asap = False + continue if selected_nodes and ignore_priority is not None: # Try to merge ignored medium_soft deps as soon as possible