| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-04 03:27:10 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 10156 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix some unwanted interaction between --tree display and unsatisfied |
| 9 |
blockers in depgraph.display(). (trunk r10155) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-04 03:24:27 UTC (rev 10155) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-04 03:27:10 UTC (rev 10156) |
| 16 |
@@ -4194,10 +4194,17 @@ |
| 17 |
if parent != inst_pkg: |
| 18 |
mygraph.add(blocker, parent) |
| 19 |
|
| 20 |
+ tree = "--tree" in self.myopts |
| 21 |
+ |
| 22 |
+ |
| 23 |
+ unsatisfied_blockers = [] |
| 24 |
i = 0 |
| 25 |
depth = 0 |
| 26 |
shown_edges = set() |
| 27 |
for x in mylist: |
| 28 |
+ if isinstance(x, Blocker) and not x.satisfied: |
| 29 |
+ unsatisfied_blockers.append(x) |
| 30 |
+ continue |
| 31 |
graph_key = x |
| 32 |
if "--tree" in self.myopts: |
| 33 |
depth = len(tree_nodes) |
| 34 |
@@ -4256,6 +4263,8 @@ |
| 35 |
else: |
| 36 |
display_list.append((x, depth, True)) |
| 37 |
mylist = display_list |
| 38 |
+ for x in unsatisfied_blockers: |
| 39 |
+ mylist.append((x, 0, True)) |
| 40 |
|
| 41 |
last_merge_depth = 0 |
| 42 |
for i in xrange(len(mylist)-1,-1,-1): |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives