summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge8
1 files changed, 6 insertions, 2 deletions
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"