From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EE733138A14 for ; Thu, 14 Feb 2013 03:40:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F2B721C01B; Thu, 14 Feb 2013 03:40:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E01721C01B for ; Thu, 14 Feb 2013 03:40:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A28633E69E for ; Thu, 14 Feb 2013 03:40:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AE144E4073 for ; Thu, 14 Feb 2013 03:40:34 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1360813219.9ea0fe8aabca82b8e8f6d05b0cde417316b635cd.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: 9ea0fe8aabca82b8e8f6d05b0cde417316b635cd X-VCS-Branch: master Date: Thu, 14 Feb 2013 03:40:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 097102cc-eeb6-41c6-9262-8a13e0aa73e2 X-Archives-Hash: 316f7570ca555881cb538fe4e72598f6 commit: 9ea0fe8aabca82b8e8f6d05b0cde417316b635cd Author: Zac Medico gentoo org> AuthorDate: Thu Feb 14 03:40:19 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Feb 14 03:40:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9ea0fe8a _slot_operator_update_probe: handle slot conflict The "insignificant change" detection from commit 0240b8b754ab5f642c50c863d4bec1dc3636ba29 is only valid when we are not trying to resolve a slot conflict (see bug #457142). --- pym/_emerge/depgraph.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 085e6cb..e0ea895 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1028,7 +1028,7 @@ class depgraph(object): dep = Dependency(atom=atom, child=other_pkg, parent=parent, root=pkg.root) - if self._slot_operator_update_probe(dep): + if self._slot_operator_update_probe(dep, slot_conflict=True): self._slot_operator_update_backtrack(dep) found_update = True @@ -1154,7 +1154,8 @@ class depgraph(object): self._dynamic_config._need_restart = True - def _slot_operator_update_probe(self, dep, new_child_slot=False): + def _slot_operator_update_probe(self, dep, new_child_slot=False, + slot_conflict=False): """ slot/sub-slot := operators tend to prevent updates from getting pulled in, since installed packages pull in packages with the slot/sub-slot that they @@ -1227,7 +1228,8 @@ class depgraph(object): continue insignificant = False - if selective and \ + if not slot_conflict and \ + selective and \ dep.parent.installed and \ dep.child.installed and \ dep.parent.cpv == replacement_parent.cpv and \ @@ -1235,7 +1237,8 @@ class depgraph(object): # Then can happen if the child's sub-slot changed # without a revision bump. The sub-slot change is # considered insignificant until one of its parent - # packages needs to be rebuilt. + # packages needs to be rebuilt (which may trigger a + # slot conflict). insignificant = True if debug: