From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 15 Jul 2008 21:17:37 +0000 (-0000)
Subject: In Scheduler._restart_if_necessary(), use list.remove() instead of assuming
X-Git-Tag: v2.2_rc2~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37a5c4f4c0e3fbb77a4056d437ea067d69ece2aa;p=portage.git

In Scheduler._restart_if_necessary(), use list.remove() instead of assuming
that portage is first in the resume list.

svn path=/main/trunk/; revision=11061
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ac21e5f3f..ac8456358 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8760,7 +8760,7 @@ class Scheduler(PollScheduler):
 			"emerge via exec() after change of " + \
 			"portage version.")
 
-		del mtimedb["resume"]["mergelist"][0]
+		mtimedb["resume"]["mergelist"].remove(list(pkg))
 		mtimedb.commit()
 		portage.run_exitfuncs()
 		mynewargv = [sys.argv[0], "--resume"]