| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-29 05:27:40 +0000 (Thu, 29 May 2008) |
| 3 |
New Revision: 10477 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/portage.py |
| 7 |
Log: |
| 8 |
Save the content of CONFIG_MEMORY_FILE in dblink.treewalk() _before_ |
| 9 |
unmerging other instances, in order to avoid overwritting/undoing |
| 10 |
the pruning that's done during unmerge. (trunk r10476) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/pym/portage.py |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/pym/portage.py 2008-05-29 05:23:18 UTC (rev 10476) |
| 16 |
+++ main/branches/2.1.2/pym/portage.py 2008-05-29 05:27:40 UTC (rev 10477) |
| 17 |
@@ -9661,6 +9661,12 @@ |
| 18 |
outfile.flush() |
| 19 |
outfile.close() |
| 20 |
|
| 21 |
+ # write out our collection of md5sums |
| 22 |
+ cfgfiledict.pop("IGNORE", None) |
| 23 |
+ portage_util.ensure_dirs(os.path.dirname(conf_mem_file), |
| 24 |
+ gid=portage_gid, mode=02750, mask=02) |
| 25 |
+ writedict(cfgfiledict, conf_mem_file) |
| 26 |
+ |
| 27 |
# These caches are populated during collision-protect and the data |
| 28 |
# they contain is now invalid. It's very important to invalidate |
| 29 |
# the contents_inodes cache so that FEATURES=unmerge-orphans |
| 30 |
@@ -9747,17 +9753,6 @@ |
| 31 |
self.vartree.dbapi.cpcache.pop(self.mysplit[0], None) |
| 32 |
contents = self.getcontents() |
| 33 |
|
| 34 |
- #write out our collection of md5sums |
| 35 |
- if cfgfiledict.has_key("IGNORE"): |
| 36 |
- del cfgfiledict["IGNORE"] |
| 37 |
- |
| 38 |
- my_private_path = os.path.join(destroot, PRIVATE_PATH) |
| 39 |
- portage_util.ensure_dirs( |
| 40 |
- my_private_path, gid=portage_gid, mode=02750, mask=02) |
| 41 |
- |
| 42 |
- writedict(cfgfiledict, conf_mem_file) |
| 43 |
- del conf_mem_file |
| 44 |
- |
| 45 |
#do postinst script |
| 46 |
self.settings["PORTAGE_UPDATE_ENV"] = \ |
| 47 |
os.path.join(self.dbpkgdir, "environment.bz2") |
| 48 |
|
| 49 |
-- |
| 50 |
gentoo-commits@l.g.o mailing list |
Archives