| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-22 23:15:19 +0000 (Sun, 22 Jun 2008) |
| 3 |
New Revision: 10761 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #228939 - Fix display list interaction with --tree mode to prevent |
| 9 |
display of a duplicate list. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-22 15:29:37 UTC (rev 10760) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-22 23:15:19 UTC (rev 10761) |
| 16 |
@@ -4405,7 +4405,10 @@ |
| 17 |
|
| 18 |
def _show_merge_list(self): |
| 19 |
if self._serialized_tasks_cache is not None and \ |
| 20 |
- self._serialized_tasks_cache != self._displayed_list: |
| 21 |
+ not (self._displayed_list and \ |
| 22 |
+ (self._displayed_list == self._serialized_tasks_cache or \ |
| 23 |
+ self._displayed_list == \ |
| 24 |
+ list(reversed(self._serialized_tasks_cache)))): |
| 25 |
display_list = self._serialized_tasks_cache[:] |
| 26 |
if "--tree" in self.myopts: |
| 27 |
display_list.reverse() |
| 28 |
|
| 29 |
-- |
| 30 |
gentoo-commits@l.g.o mailing list |
Archives