| 1 |
commit: e9cdbdef71988909cb32a63d4c2da2524641c142 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Thu Nov 28 03:04:32 2013 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 5 |
CommitDate: Thu Nov 28 03:04:32 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e9cdbdef |
| 7 |
|
| 8 |
_emerge.depgraph.depgraph._compute_abi_rebuild_info(): Simplify some code. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 6 ++---- |
| 12 |
1 file changed, 2 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index da2e604..6634405 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -659,15 +659,13 @@ class depgraph(object): |
| 19 |
|
| 20 |
# Make sure the child's slot/subslot has changed. If it hasn't, |
| 21 |
# then another child has forced this rebuild. |
| 22 |
- installed_pkg, _ = self._select_pkg_from_installed(root, dep.child.slot_atom) |
| 23 |
+ installed_pkg = self._select_pkg_from_installed(root, dep.child.slot_atom)[0] |
| 24 |
if installed_pkg and installed_pkg.slot == dep.child.slot and \ |
| 25 |
installed_pkg.sub_slot == dep.child.sub_slot: |
| 26 |
continue |
| 27 |
|
| 28 |
# The child has forced a rebuild of the parent |
| 29 |
- forced_rebuilds.setdefault(root, {}) |
| 30 |
- forced_rebuilds[root].setdefault(dep.child, set()) |
| 31 |
- forced_rebuilds[root][dep.child].add(dep.parent) |
| 32 |
+ forced_rebuilds.setdefault(root, {}).setdefault(dep.child, set()).add(dep.parent) |
| 33 |
|
| 34 |
if debug: |
| 35 |
writemsg_level("slot operator dependencies:\n", |
Archives