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 1QVECo-0001pO-VK for garchives@archives.gentoo.org; Sat, 11 Jun 2011 02:45:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2580A1C002; Sat, 11 Jun 2011 02:45:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E8EA61C002 for ; Sat, 11 Jun 2011 02:45:36 +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 3A6641B4031 for ; Sat, 11 Jun 2011 02:45:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 547EC8003C for ; Sat, 11 Jun 2011 02:45:35 +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: 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: d2403147d289aa34c27b16762e81c362d643b555 Date: Sat, 11 Jun 2011 02:45:35 +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: 3027343d41889cdd2d682ce87f1000cd commit: d2403147d289aa34c27b16762e81c362d643b555 Author: Zac Medico gentoo org> AuthorDate: Sat Jun 11 02:45:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 11 02:45:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd2403147 depgraph._serialize_tasks: tweak last commit This code is only intended when more than one node is selected. --- pym/_emerge/depgraph.py | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index fab10eb..13152a7 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5035,13 +5035,15 @@ class depgraph(object): # cycle that is obviously sub-optimal. This will be # obvious if any of selected_nodes is a leaf node # when medium_soft deps are ignored. - for node in selected_nodes: - if not mygraph.child_nodes(node, ignore_priority =3D - DepPriorityNormalRange.ignore_medium_soft): - prefer_asap =3D False - break - if not prefer_asap: - continue + if len(selected_nodes) > 1: + for node in selected_nodes: + if not mygraph.child_nodes(node, + ignore_priority =3D + DepPriorityNormalRange.ignore_medium_soft): + prefer_asap =3D False + break + if not prefer_asap: + continue =20 if selected_nodes and ignore_priority is not None: # Try to merge ignored medium_soft deps as soon as possible