summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-02-09 01:10:08 +0000
committerZac Medico <zmedico@gentoo.org>2006-02-09 01:10:08 +0000
commitcbc38717d510b106a27dabeec517111fcd54a5b0 (patch)
treeafcc0a31a47f6d1bff7a498cae929540559c7ce7 /bin/emerge
parente390bbaa28903e6d3f6faca15bb4ff9714a889ee (diff)
downloadportage-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 'bin/emerge')
-rwxr-xr-xbin/emerge4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 716068a24..795092e34 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1916,7 +1916,7 @@ class depgraph:
myfavdict[myfavkey]=myfavkey
print ">>> Recording",myfavkey,"in \"world\" favorites file..."
if not "--fetchonly" in myopts:
- portage.writedict(myfavdict,portage.root+portage.WORLD_FILE,writekey=0)
+ portage.write_atomic(os.path.join(portage.root,portage.WORLD_FILE),"\n".join(myfavdict.values()))
portage.mtimedb["resume"]["mergelist"]=mymergelist[:]
@@ -2087,7 +2087,7 @@ class depgraph:
myfavdict[myfavkey]=myfavkey
print ">>> Recording",myfavkey,"in \"world\" favorites file..."
emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Updating world file ("+x[pkgindex]+")")
- portage.writedict(myfavdict,myroot+portage.WORLD_FILE,writekey=0)
+ portage.write_atomic(os.path.join(myroot,portage.WORLD_FILE),"\n".join(myfavdict.values()))
if ("noclean" not in portage.features) and (x[0] != "binary"):
short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean Post"