diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-08 18:37:21 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-08 18:37:21 +0000 |
| commit | 9250cfa11753d6e3bd95b897aed82c42d037a3ee (patch) | |
| tree | 3649db772bee9e7dd46e166178c9c5075738acde /bin | |
| parent | 95cb48a6aba8e96dde7487325670e2fe8032ea7b (diff) | |
| download | portage-9250cfa11753d6e3bd95b897aed82c42d037a3ee.tar.gz portage-9250cfa11753d6e3bd95b897aed82c42d037a3ee.tar.bz2 portage-9250cfa11753d6e3bd95b897aed82c42d037a3ee.zip | |
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
Diffstat (limited to 'bin')
| -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": |