diff options
Diffstat (limited to 'bin/emerge')
-rwxr-xr-x | bin/emerge | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index c3ed70ed5..ad12c62b7 100755 --- 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": |