From 0b93a666b7d09d709a563d9ef76637ef7bbcd444 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 5 Mar 2006 00:10:40 +0000 Subject: Strip the leading slash from WORLD_FILE so that os.path.join works correctly for bug #124471. Thanks to Thomas de Grenier de Latour for finding the cause of the problem and Jonathan Adamczewski for the initial report. svn path=/main/trunk/; revision=2812 --- bin/emerge | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index f13a95c1e..4afe24432 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1861,7 +1861,9 @@ class depgraph: myfavdict[myfavkey]=myfavkey print ">>> Recording",myfavkey,"in \"world\" favorites file..." if not "--fetchonly" in myopts: - portage.write_atomic(os.path.join(portage.root,portage.WORLD_FILE),"\n".join(myfavdict.values())) + portage.write_atomic( + os.path.join(portage.root, portage.WORLD_FILE.lstrip(os.sep)), + "\n".join(myfavdict.values())) portage.mtimedb["resume"]["mergelist"]=mymergelist[:] @@ -2032,7 +2034,9 @@ 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.write_atomic(os.path.join(myroot,portage.WORLD_FILE),"\n".join(myfavdict.values())) + portage.write_atomic( + os.path.join(myroot, portage.WORLD_FILE.lstrip(os.sep)), + "\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" -- cgit v1.2.3-1-g7c22