| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-10 08:07:58 +0000 (Sat, 10 May 2008) |
| 3 |
New Revision: 10278 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix another KeyError, reported in Bug #221107, comment #4. There's no need |
| 9 |
to remove uninstall tasks from scheduled_uninstalls, so just keep them |
| 10 |
in there. (trunk r10277) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-05-10 08:07:35 UTC (rev 10277) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-05-10 08:07:58 UTC (rev 10278) |
| 17 |
@@ -4157,7 +4157,6 @@ |
| 18 |
"uninstall" == node.operation: |
| 19 |
have_uninstall_task = True |
| 20 |
uninst_task = node |
| 21 |
- scheduled_uninstalls.remove(uninst_task) |
| 22 |
else: |
| 23 |
vardb = self.trees[node.root]["vartree"].dbapi |
| 24 |
previous_cpv = vardb.match(node.slot_atom) |
| 25 |
@@ -4171,7 +4170,6 @@ |
| 26 |
mygraph.remove(uninst_task) |
| 27 |
except KeyError: |
| 28 |
pass |
| 29 |
- scheduled_uninstalls.discard(uninst_task) |
| 30 |
|
| 31 |
if uninst_task is not None and \ |
| 32 |
uninst_task not in ignored_uninstall_tasks and \ |
| 33 |
|
| 34 |
-- |
| 35 |
gentoo-commits@l.g.o mailing list |
Archives