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 ac21e5f3fe6fda7a261fcdc3c7a27596fd4653ce..ac8456358d2087aa29ed61e2d8a24e9548c1f57a 100644 (file)
--- 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"]