From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Thu, 28 Nov 2013 03:04:32 +0000 (+0100)
Subject: _emerge.depgraph.depgraph._compute_abi_rebuild_info(): Simplify some code.
X-Git-Tag: v2.2.8~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9cdbdef71988909cb32a63d4c2da2524641c142;p=portage.git

_emerge.depgraph.depgraph._compute_abi_rebuild_info(): Simplify some code.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index da2e60422..66344052f 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",