summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-08 18:35:39 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-08 18:35:39 +0000
commitfbbcfc3811d1df1afe398041fe244f27c213cb75 (patch)
tree6e7b8c2e6e932268659523b58c1f7aaae105d85c
parent65a421ae35acd5639ad1258e220754a85e55de6e (diff)
downloadportage-fbbcfc3811d1df1afe398041fe244f27c213cb75.tar.gz
portage-fbbcfc3811d1df1afe398041fe244f27c213cb75.tar.bz2
portage-fbbcfc3811d1df1afe398041fe244f27c213cb75.zip
Don't save "uninstall" tasks in the resume list since they'll be regenerated
by dependency calculations upon resume. svn path=/main/trunk/; revision=10239
-rw-r--r--pym/_emerge/__init__.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index f245805cd..7a7526d2d 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5058,7 +5058,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:
@@ -5615,7 +5615,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
@@ -5705,8 +5705,6 @@ class MergeTask(object):
if not (buildpkgonly or fetchonly or pretend):
unmerge(root_config, self.myopts, "unmerge",
[pkg.cpv], mtimedb["ldpath"], clean_world=0)
- del mtimedb["resume"]["mergelist"][0]
- mtimedb.commit()
continue
if x[0]=="blocks":