1 |
Author: zmedico |
2 |
Date: 2008-05-09 19:04:14 +0000 (Fri, 09 May 2008) |
3 |
New Revision: 10273 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Bug #221071 - Prevent display_problems() from redundantly displaying |
9 |
the exact same merge list a second time. |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-09 18:37:04 UTC (rev 10272) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-09 19:04:14 UTC (rev 10273) |
16 |
@@ -1914,6 +1914,7 @@ |
17 |
# blocker validation is only able to account for one package per slot. |
18 |
self._slot_collision_nodes = set() |
19 |
self._serialized_tasks_cache = None |
20 |
+ self._displayed_list = None |
21 |
self._pprovided_args = [] |
22 |
self._missing_args = [] |
23 |
self._masked_installed = [] |
24 |
@@ -4117,7 +4118,8 @@ |
25 |
"optional dependencies.\n", noiselevel=-1) |
26 |
|
27 |
def _show_merge_list(self): |
28 |
- if self._serialized_tasks_cache is not None: |
29 |
+ if self._serialized_tasks_cache is not None and \ |
30 |
+ self._serialized_tasks_cache != self._displayed_list: |
31 |
display_list = self._serialized_tasks_cache[:] |
32 |
if "--tree" in self.myopts: |
33 |
display_list.reverse() |
34 |
@@ -4137,6 +4139,12 @@ |
35 |
show_blocker_docs_link() |
36 |
|
37 |
def display(self, mylist, favorites=[], verbosity=None): |
38 |
+ |
39 |
+ # This is used to prevent display_problems() from |
40 |
+ # redundantly displaying this exact same merge list |
41 |
+ # again via _show_merge_list(). |
42 |
+ self._displayed_list = mylist |
43 |
+ |
44 |
if verbosity is None: |
45 |
verbosity = ("--quiet" in self.myopts and 1 or \ |
46 |
"--verbose" in self.myopts and 3 or 2) |
47 |
|
48 |
-- |
49 |
gentoo-commits@l.g.o mailing list |