From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QVGfV-00070S-0a for garchives@archives.gentoo.org; Sat, 11 Jun 2011 05:23:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E61911C024; Sat, 11 Jun 2011 05:23:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B26431C024 for ; Sat, 11 Jun 2011 05:23:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F6771B4031 for ; Sat, 11 Jun 2011 05:23:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 70BB48003C for ; Sat, 11 Jun 2011 05:23:22 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <9390abed8b1a7dfa47c1ee0e25d83202afccda83.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9390abed8b1a7dfa47c1ee0e25d83202afccda83 Date: Sat, 11 Jun 2011 05:23:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a5b215ecaf84ae6d8c9051caa7e29468 commit: 9390abed8b1a7dfa47c1ee0e25d83202afccda83 Author: Zac Medico gentoo org> AuthorDate: Sat Jun 11 05:21:19 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 11 05:21:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9390abed depgraph._serialize_tasks: revert formatting diff --- pym/_emerge/depgraph.py | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index ca86904..5ad19e8 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5041,12 +5041,11 @@ class depgraph(object): if selected_nodes: break =20 - 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 =3D 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 =3D False + continue =20 if selected_nodes and ignore_priority is not None: # Try to merge ignored medium_soft deps as soon as possible