Don't save "uninstall" tasks in the resume list since they'll be regenerated

by dependency calculations upon resume. (trunk r10239)

svn path=/main/branches/2.1.2/; revision=10240

diff --git a/bin/emerge b/bin/emerge
index c3ed70ed5a9954f746b75aa6d805728803f1aea0..ad12c62b7f2f79664ddd71a526bafd07172927bb 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -5221,7 +5221,7 @@ class depgraph(object):
                        pkg_type, myroot, pkg_key, action = x
                        if pkg_type not in self.pkg_tree_map:
                                continue
-                       if action not in ("merge", "uninstall"):
+                       if action != "merge":
                                continue
                        mydb = trees[myroot][self.pkg_tree_map[pkg_type]].dbapi
                        try:
@@ -5775,7 +5775,7 @@ class MergeTask(object):
                world_set = root_config.sets["world"]
 
                mtimedb["resume"]["mergelist"] = [list(x) for x in mylist \
-                       if isinstance(x, Package)]
+                       if isinstance(x, Package) and x.operation == "merge"]
                mtimedb.commit()
 
                mymergelist = mylist
@@ -5866,8 +5866,6 @@ class MergeTask(object):
                                        unmerge(root_config.settings, self.myopts,
                                                root_config.trees["vartree"], "unmerge",
                                                [pkg.cpv], mtimedb["ldpath"], clean_world=0)
-                                       del mtimedb["resume"]["mergelist"][0]
-                                       mtimedb.commit()
                                continue
 
                        if x[0]=="blocks":