| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-09 18:37:04 +0000 (Fri, 09 May 2008) |
| 3 |
New Revision: 10272 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Bug #221107 - Fix depgraph._serialize_tasks() so that it doesn't |
| 9 |
try to schedule an uninstall task that's already been scheduled |
| 10 |
but hasn't been executed yet due to dependence on installation of |
| 11 |
blocking packages. (trunk r10271) |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/branches/2.1.2/bin/emerge |
| 15 |
=================================================================== |
| 16 |
--- main/branches/2.1.2/bin/emerge 2008-05-09 18:36:19 UTC (rev 10271) |
| 17 |
+++ main/branches/2.1.2/bin/emerge 2008-05-09 18:37:04 UTC (rev 10272) |
| 18 |
@@ -3980,6 +3980,12 @@ |
| 19 |
if task in ignored_uninstall_tasks: |
| 20 |
continue |
| 21 |
|
| 22 |
+ if task in scheduled_uninstalls: |
| 23 |
+ # It's been scheduled but it hasn't |
| 24 |
+ # been executed yet due to dependence |
| 25 |
+ # on installation of blocking packages. |
| 26 |
+ continue |
| 27 |
+ |
| 28 |
root_config = self.roots[task.root] |
| 29 |
inst_pkg = self._pkg_cache[ |
| 30 |
("installed", task.root, task.cpv, "nomerge")] |
| 31 |
|
| 32 |
-- |
| 33 |
gentoo-commits@l.g.o mailing list |
Archives