Bug #228939 - Fix display list interaction with --tree mode to prevent

display of a duplicate list. (trunk r10761)

svn path=/main/branches/2.1.2/; revision=11426

diff --git a/bin/emerge b/bin/emerge
index 822df6bc4fc605cb2332e8fb71a186f99e4394cd..f7cf923677b9d453dbe8951b4632d1dcb7bd05d3 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4471,7 +4471,10 @@ class depgraph(object):
 
        def _show_merge_list(self):
                if self._serialized_tasks_cache is not None and \
-                       self._serialized_tasks_cache != self._displayed_list:
+                       not (self._displayed_list and \
+                       (self._displayed_list == self._serialized_tasks_cache or \
+                       self._displayed_list == \
+                               list(reversed(self._serialized_tasks_cache)))):
                        display_list = self._serialized_tasks_cache[:]
                        if "--tree" in self.myopts:
                                display_list.reverse()