summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-09 19:04:14 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-09 19:04:14 +0000
commitb042f5fbe54f1beae112b690c979d593c401c0c4 (patch)
treee59db5d827aa73c435ff9a550c5672220257cc48
parent1537947c6e62ac845aba2a0fd51e26c36bb8acd4 (diff)
downloadportage-b042f5fbe54f1beae112b690c979d593c401c0c4.tar.gz
portage-b042f5fbe54f1beae112b690c979d593c401c0c4.tar.bz2
portage-b042f5fbe54f1beae112b690c979d593c401c0c4.zip
Bug #221071 - Prevent display_problems() from redundantly displaying
the exact same merge list a second time. svn path=/main/trunk/; revision=10273
-rw-r--r--pym/_emerge/__init__.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index eede39375..1d05c67a9 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1914,6 +1914,7 @@ class depgraph(object):
# blocker validation is only able to account for one package per slot.
self._slot_collision_nodes = set()
self._serialized_tasks_cache = None
+ self._displayed_list = None
self._pprovided_args = []
self._missing_args = []
self._masked_installed = []
@@ -4117,7 +4118,8 @@ class depgraph(object):
"optional dependencies.\n", noiselevel=-1)
def _show_merge_list(self):
- if self._serialized_tasks_cache is not None:
+ if self._serialized_tasks_cache is not None and \
+ self._serialized_tasks_cache != self._displayed_list:
display_list = self._serialized_tasks_cache[:]
if "--tree" in self.myopts:
display_list.reverse()
@@ -4137,6 +4139,12 @@ class depgraph(object):
show_blocker_docs_link()
def display(self, mylist, favorites=[], verbosity=None):
+
+ # This is used to prevent display_problems() from
+ # redundantly displaying this exact same merge list
+ # again via _show_merge_list().
+ self._displayed_list = mylist
+
if verbosity is None:
verbosity = ("--quiet" in self.myopts and 1 or \
"--verbose" in self.myopts and 3 or 2)