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 0CD65138247 for ; Thu, 28 Nov 2013 03:06:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4CF7E0957; Thu, 28 Nov 2013 03:06:07 +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 841ABE0957 for ; Thu, 28 Nov 2013 03:06:07 +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 7D06533F2CE for ; Thu, 28 Nov 2013 03:06:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3576919002B for ; Thu, 28 Nov 2013 03:06:04 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1385607872.e9cdbdef71988909cb32a63d4c2da2524641c142.arfrever@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: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: e9cdbdef71988909cb32a63d4c2da2524641c142 X-VCS-Branch: master Date: Thu, 28 Nov 2013 03:06:04 +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: c35849c8-246b-4f7e-a638-b864bc1260b2 X-Archives-Hash: 6ce14c1b7abfa74d80f5b24e68078643 commit: e9cdbdef71988909cb32a63d4c2da2524641c142 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Thu Nov 28 03:04:32 2013 +0000 Commit: Arfrever Frehtes Taifersar Arahesis Apache Org> CommitDate: Thu Nov 28 03:04:32 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e9cdbdef _emerge.depgraph.depgraph._compute_abi_rebuild_info(): Simplify some code. --- pym/_emerge/depgraph.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index da2e604..6634405 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -659,15 +659,13 @@ class depgraph(object): # Make sure the child's slot/subslot has changed. If it hasn't, # then another child has forced this rebuild. - installed_pkg, _ = self._select_pkg_from_installed(root, dep.child.slot_atom) + installed_pkg = self._select_pkg_from_installed(root, dep.child.slot_atom)[0] if installed_pkg and installed_pkg.slot == dep.child.slot and \ installed_pkg.sub_slot == dep.child.sub_slot: continue # The child has forced a rebuild of the parent - forced_rebuilds.setdefault(root, {}) - forced_rebuilds[root].setdefault(dep.child, set()) - forced_rebuilds[root][dep.child].add(dep.parent) + forced_rebuilds.setdefault(root, {}).setdefault(dep.child, set()).add(dep.parent) if debug: writemsg_level("slot operator dependencies:\n",