diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-02-09 01:10:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-02-09 01:10:08 +0000 |
| commit | cbc38717d510b106a27dabeec517111fcd54a5b0 (patch) | |
| tree | afcc0a31a47f6d1bff7a498cae929540559c7ce7 /pym | |
| parent | e390bbaa28903e6d3f6faca15bb4ff9714a889ee (diff) | |
| download | portage-cbc38717d510b106a27dabeec517111fcd54a5b0.tar.gz portage-cbc38717d510b106a27dabeec517111fcd54a5b0.tar.bz2 portage-cbc38717d510b106a27dabeec517111fcd54a5b0.zip | |
use new write_atomic() function for all world file updates
svn path=/main/trunk/; revision=2681
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pym/portage.py b/pym/portage.py index 0018ab914..14992901f 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -92,7 +92,7 @@ try: portage_uid, portage_gid import portage_util - from portage_util import grabdict, grabdict_package, grabfile, grabfile_package, \ + from portage_util import grabdict, grabdict_package, grabfile, grabfile_package, write_atomic, \ map_dictlist_vals, pickle_read, pickle_write, stack_dictlist, stack_dicts, stack_lists, \ unique_array, varexpand, writedict, writemsg, writemsg_stdout, getconfig, dump_traceback import portage_exception @@ -5862,10 +5862,7 @@ class dblink: os.chown(pdir, 0, portage_gid) os.chmod(pdir, 02770) - myworld=open(self.myroot+WORLD_FILE,"w") - for x in newworldlist: - myworld.write(x+"\n") - myworld.close() + write_atomic(os.path.join(self.myroot,WORLD_FILE),"\n".join(newworldlist)) #do original postrm if myebuildpath and os.path.exists(myebuildpath): @@ -6874,10 +6871,7 @@ def do_upgrade(mykey): if processed: #update our internal mtime since we processed all our directives. mtimedb["updates"][mykey]=os.stat(mykey)[stat.ST_MTIME] - myworld=open("/"+WORLD_FILE,"w") - for x in worldlist: - myworld.write(x+"\n") - myworld.close() + write_atomic(WORLD_FILE,"\n".join(worldlist)) print "" def commit_mtimedb(): |