| 1 |
commit: abcf9f8b8fcc7daacafc8284a580436d94e1668f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 29 01:10:06 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 29 01:10:58 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=abcf9f8b |
| 7 |
|
| 8 |
depgraph: verify "missed updates" |
| 9 |
|
| 10 |
Since the change involving slot conflict parent atoms in commit |
| 11 |
6cea2091526659521d35be6c8dc7733f69f1a760, we want to check to make |
| 12 |
sure we don't display any false positives in the "missed updates". |
| 13 |
|
| 14 |
--- |
| 15 |
pym/_emerge/depgraph.py | 4 ++++ |
| 16 |
1 files changed, 4 insertions(+), 0 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 19 |
index f9f4954..b58b76f 100644 |
| 20 |
--- a/pym/_emerge/depgraph.py |
| 21 |
+++ b/pym/_emerge/depgraph.py |
| 22 |
@@ -591,6 +591,10 @@ class depgraph(object): |
| 23 |
# Exclude installed here since we only |
| 24 |
# want to show available updates. |
| 25 |
continue |
| 26 |
+ chosen_pkg, existing_node = \ |
| 27 |
+ self._select_package(pkg.root, pkg.slot_atom) |
| 28 |
+ if chosen_pkg >= pkg: |
| 29 |
+ continue |
| 30 |
k = (pkg.root, pkg.slot_atom) |
| 31 |
if k in missed_updates: |
| 32 |
other_pkg, mask_type, parent_atoms = missed_updates[k] |
Archives