From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 8 May 2008 20:05:53 +0000 (-0000)
Subject:    Merged from trunk 10245:10246
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ccfd65a3c68b2639d2a2b948557452c56d93ee99;p=portage.git

   Merged from trunk 10245:10246

   | 10246   | Remove stale uninstall tasks from scheduled_uninstalls when  |
   | zmedico | necessary.                                                   |

svn path=/main/branches/prefix/; revision=10249
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index fbb3ea57f..332c32215 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4038,6 +4038,8 @@ class depgraph(object):
 							mygraph.remove(uninst_task)
 						except KeyError:
 							pass
+						scheduled_uninstalls.discard(uninst_task)
+
 				if uninst_task is not None and \
 					uninst_task not in ignored_uninstall_tasks and \
 					myblocker_uninstalls.contains(uninst_task):