| 1 |
commit: d15e3dded958eebdb52c7370e28a62002b70dfe3 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 23 05:59:51 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 23 05:59:51 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d15e3dde |
| 7 |
|
| 8 |
slot_abi_mask_built: don't discard other masks |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/resolver/backtracking.py | 4 +++- |
| 12 |
1 files changed, 3 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/backtracking.py |
| 15 |
index 09df9c8..f39bad4 100644 |
| 16 |
--- a/pym/_emerge/resolver/backtracking.py |
| 17 |
+++ b/pym/_emerge/resolver/backtracking.py |
| 18 |
@@ -187,7 +187,9 @@ class Backtracker(object): |
| 19 |
for pkg, (new_use, new_changes) in data: |
| 20 |
para.needed_use_config_changes[pkg] = (new_use, new_changes) |
| 21 |
elif change == "slot_abi_mask_built": |
| 22 |
- para.runtime_pkg_mask.update(data) |
| 23 |
+ for pkg, mask_reasons in data.items(): |
| 24 |
+ para.runtime_pkg_mask.setdefault(pkg, |
| 25 |
+ {}).update(mask_reasons) |
| 26 |
elif change == "slot_abi_replace_installed": |
| 27 |
para.slot_abi_replace_installed.update(data) |
| 28 |
elif change == "rebuild_list": |
Archives