diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-29 05:27:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-29 05:27:40 +0000 |
| commit | a06f5c6df19a41847414d295bf23392a10248a69 (patch) | |
| tree | 209d76286aab3587081174433d1407a07e218694 /pym | |
| parent | 95eabb177220170143cad3b7d805447bf44500ab (diff) | |
| download | portage-a06f5c6df19a41847414d295bf23392a10248a69.tar.gz portage-a06f5c6df19a41847414d295bf23392a10248a69.tar.bz2 portage-a06f5c6df19a41847414d295bf23392a10248a69.zip | |
Save the content of CONFIG_MEMORY_FILE in dblink.treewalk() _before_
unmerging other instances, in order to avoid overwritting/undoing
the pruning that's done during unmerge. (trunk r10476)
svn path=/main/branches/2.1.2/; revision=10477
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pym/portage.py b/pym/portage.py index 21f20539a..812aaaa5a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -9661,6 +9661,12 @@ class dblink: outfile.flush() outfile.close() + # write out our collection of md5sums + cfgfiledict.pop("IGNORE", None) + portage_util.ensure_dirs(os.path.dirname(conf_mem_file), + gid=portage_gid, mode=02750, mask=02) + writedict(cfgfiledict, conf_mem_file) + # These caches are populated during collision-protect and the data # they contain is now invalid. It's very important to invalidate # the contents_inodes cache so that FEATURES=unmerge-orphans @@ -9747,17 +9753,6 @@ class dblink: self.vartree.dbapi.cpcache.pop(self.mysplit[0], None) contents = self.getcontents() - #write out our collection of md5sums - if cfgfiledict.has_key("IGNORE"): - del cfgfiledict["IGNORE"] - - my_private_path = os.path.join(destroot, PRIVATE_PATH) - portage_util.ensure_dirs( - my_private_path, gid=portage_gid, mode=02750, mask=02) - - writedict(cfgfiledict, conf_mem_file) - del conf_mem_file - #do postinst script self.settings["PORTAGE_UPDATE_ENV"] = \ os.path.join(self.dbpkgdir, "environment.bz2") |