From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F23EA139694 for ; Thu, 20 Apr 2017 19:39:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2E8EE0CB6; Thu, 20 Apr 2017 19:39:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1BAEE0CB6 for ; Thu, 20 Apr 2017 19:39:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FB62341301 for ; Thu, 20 Apr 2017 19:39:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 754057439 for ; Thu, 20 Apr 2017 19:39:29 +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: <1492717140.b9767a27b8af541a05de6a376493b6556649f24b.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: b9767a27b8af541a05de6a376493b6556649f24b X-VCS-Branch: master Date: Thu, 20 Apr 2017 19:39:29 +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: f3c1d2cf-2250-4c73-83e3-91ca6eb81d4a X-Archives-Hash: bdbc5b27b38cf6e42977097ee81e90fb commit: b9767a27b8af541a05de6a376493b6556649f24b Author: Zac Medico gentoo org> AuthorDate: Wed Apr 19 02:37:38 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Apr 20 19:39:00 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b9767a27 depgraph: fix _validate_blockers to revert state from previous calls Since the _solve_non_slot_operator_slot_conflicts method can remove packages from the graph, it's possible that some of the state changes made by previous _validate_blockers calls are no longer valid. Therefore, revert state when appropriate. Acked-by: Brian Dolbec gentoo.org> pym/_emerge/depgraph.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 8a614c495..3232816d5 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6901,6 +6901,12 @@ class depgraph(object): self._dynamic_config._blocker_uninstalls = digraph() self._dynamic_config.digraph.difference_update(previous_uninstall_tasks) + # Revert state from previous calls. + self._dynamic_config._blocker_parents.update( + self._dynamic_config._irrelevant_blockers) + self._dynamic_config._irrelevant_blockers.clear() + self._dynamic_config._unsolvable_blockers.clear() + for blocker in self._dynamic_config._blocker_parents.leaf_nodes(): self._spinner_update() root_config = self._frozen_config.roots[blocker.root]