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 9A3581387FD for ; Sun, 8 Jun 2014 11:06:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3183EE0A6D; Sun, 8 Jun 2014 11:06:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB632E0A6D for ; Sun, 8 Jun 2014 11:06:29 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC979340002 for ; Sun, 8 Jun 2014 11:06:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id AAC33181A9 for ; Sun, 8 Jun 2014 11:06:26 +0000 (UTC) From: "Sebastian Luther" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Luther" Message-ID: <1402225314.057aba82c112c3933560d83d20fcfc971fc471da.few@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: few X-VCS-Committer-Name: Sebastian Luther X-VCS-Revision: 057aba82c112c3933560d83d20fcfc971fc471da X-VCS-Branch: master Date: Sun, 8 Jun 2014 11:06:26 +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: 368ba267-c8ba-4f1f-b7cc-f70aa4591244 X-Archives-Hash: 4176bc357fce9767640145fffe356ea6 commit: 057aba82c112c3933560d83d20fcfc971fc471da Author: Sebastian Luther gmx de> AuthorDate: Sun Jun 8 11:01:54 2014 +0000 Commit: Sebastian Luther gmx de > CommitDate: Sun Jun 8 11:01:54 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=057aba82 More debug output for the slot conflict handler --- pym/_emerge/depgraph.py | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 28d4026..4acb114 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -990,6 +990,11 @@ class depgraph(object): if not conflicts: return + if debug: + writemsg_level( + "\n!!! Slot conflict handler started.\n", + level=logging.DEBUG, noiselevel=-1) + # Get a set of all conflicting packages. conflict_pkgs = set() for conflict in conflicts: @@ -1044,6 +1049,13 @@ class depgraph(object): return "(%s)" % ",".join(str(pkg) for pkg in self) for conflict in conflicts: + if debug: + writemsg_level(" conflict:\n", level=logging.DEBUG, noiselevel=-1) + writemsg_level(" root: %s\n" % conflict.root, level=logging.DEBUG, noiselevel=-1) + writemsg_level(" atom: %s\n" % conflict.atom, level=logging.DEBUG, noiselevel=-1) + for pkg in conflict: + writemsg_level(" pkg: %s\n" % pkg, level=logging.DEBUG, noiselevel=-1) + all_parent_atoms = set() for pkg in conflict: all_parent_atoms.update( @@ -1051,9 +1063,16 @@ class depgraph(object): for parent, atom in all_parent_atoms: is_arg_parent = isinstance(parent, AtomArg) + is_non_conflict_parent = parent not in conflict_pkgs and \ + parent not in indirect_conflict_pkgs - if parent not in conflict_pkgs and \ - parent not in indirect_conflict_pkgs: + if debug: + writemsg_level(" parent: %s\n" % parent, level=logging.DEBUG, noiselevel=-1) + writemsg_level(" arg, non-conflict: %s, %s\n" % (is_arg_parent, is_non_conflict_parent), + level=logging.DEBUG, noiselevel=-1) + writemsg_level(" atom: %s\n" % atom, level=logging.DEBUG, noiselevel=-1) + + if is_non_conflict_parent: parent = non_conflict_node atom_set = InternalPackageSet( @@ -1065,6 +1084,11 @@ class depgraph(object): modified_use=self._pkg_use_enabled(pkg)) and \ not (is_arg_parent and pkg.installed): matched.append(pkg) + + if debug: + for match in matched: + writemsg_level(" match: %s\n" % match, level=logging.DEBUG, noiselevel=-1) + if len(matched) == len(conflict): # All packages match. continue