Strip the leading slash from WORLD_FILE so that os.path.join works correctly for...

svn path=/main/trunk/; revision=2812

diff --git a/bin/emerge b/bin/emerge
index f13a95c1e0e541028eab42625a4243bdf2dd142b..4afe24432956143717fac3693d28f02a73614515 100755 (executable)
--- 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"

diff --git a/pym/portage.py b/pym/portage.py
index 8dd2866b09953074a174b01b481ee882a62525d1..c36e191939c74da65420d7e8f92e0d182eda03ee 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5826,7 +5826,8 @@ class dblink:
                                os.chown(pdir, 0, portage_gid)
                                os.chmod(pdir, 02770)
 
-                       write_atomic(os.path.join(self.myroot,WORLD_FILE),"\n".join(newworldlist))
+                       write_atomic(os.path.join(self.myroot, WORLD_FILE.lstrip(os.sep)),
+                       "\n".join(newworldlist))
 
                #do original postrm
                if myebuildpath and os.path.exists(myebuildpath):