| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-08 18:37:21 +0000 (Thu, 08 May 2008) |
| 3 |
New Revision: 10240 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Don't save "uninstall" tasks in the resume list since they'll be regenerated |
| 9 |
by dependency calculations upon resume. (trunk r10239) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-08 18:35:39 UTC (rev 10239) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-08 18:37:21 UTC (rev 10240) |
| 16 |
@@ -5221,7 +5221,7 @@ |
| 17 |
pkg_type, myroot, pkg_key, action = x |
| 18 |
if pkg_type not in self.pkg_tree_map: |
| 19 |
continue |
| 20 |
- if action not in ("merge", "uninstall"): |
| 21 |
+ if action != "merge": |
| 22 |
continue |
| 23 |
mydb = trees[myroot][self.pkg_tree_map[pkg_type]].dbapi |
| 24 |
try: |
| 25 |
@@ -5775,7 +5775,7 @@ |
| 26 |
world_set = root_config.sets["world"] |
| 27 |
|
| 28 |
mtimedb["resume"]["mergelist"] = [list(x) for x in mylist \ |
| 29 |
- if isinstance(x, Package)] |
| 30 |
+ if isinstance(x, Package) and x.operation == "merge"] |
| 31 |
mtimedb.commit() |
| 32 |
|
| 33 |
mymergelist = mylist |
| 34 |
@@ -5866,8 +5866,6 @@ |
| 35 |
unmerge(root_config.settings, self.myopts, |
| 36 |
root_config.trees["vartree"], "unmerge", |
| 37 |
[pkg.cpv], mtimedb["ldpath"], clean_world=0) |
| 38 |
- del mtimedb["resume"]["mergelist"][0] |
| 39 |
- mtimedb.commit() |
| 40 |
continue |
| 41 |
|
| 42 |
if x[0]=="blocks": |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives