summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-22 23:15:19 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-22 23:15:19 +0000
commit98cf6467bc43c2167adbcc6a51977a392c07772c (patch)
tree29800d51badccd6b1c8ce2920c4c7e38541a074f
parenta55e4523d3b699db69cbb4b9add385d53380cdbf (diff)
downloadportage-98cf6467bc43c2167adbcc6a51977a392c07772c.tar.gz
portage-98cf6467bc43c2167adbcc6a51977a392c07772c.tar.bz2
portage-98cf6467bc43c2167adbcc6a51977a392c07772c.zip
Bug #228939 - Fix display list interaction with --tree mode to prevent
display of a duplicate list. svn path=/main/trunk/; revision=10761
-rw-r--r--pym/_emerge/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index cb017c9bc..2de005815 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4405,7 +4405,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()