Attachment #81331 for bug #124471

Lines 5826-5832 Link Here

(-)pym/portage.py (-1 / +1 lines)
5826	os.chown(pdir, 0, portage_gid)	5826	os.chown(pdir, 0, portage_gid)
5827	os.chmod(pdir, 02770)	5827	os.chmod(pdir, 02770)
5828		5828
5829	write_atomic(os.path.join(self.myroot,WORLD_FILE),"\n".join(newworldlist))	5829	write_atomic(os.path.join(self.myroot, WORLD_FILE.lstrip(os.sep)),"\n".join(newworldlist))
5830		5830
5831	#do original postrm	5831	#do original postrm
5832	if myebuildpath and os.path.exists(myebuildpath):	5832	if myebuildpath and os.path.exists(myebuildpath):

Lines 1861-1867 Link Here

(-)bin/emerge (-2 / +2 lines)
1861	myfavdict[myfavkey]=myfavkey	1861	myfavdict[myfavkey]=myfavkey
1862	print ">>> Recording",myfavkey,"in \"world\" favorites file..."	1862	print ">>> Recording",myfavkey,"in \"world\" favorites file..."
1863	if not "--fetchonly" in myopts:	1863	if not "--fetchonly" in myopts:
1864	portage.write_atomic(os.path.join(portage.root,portage.WORLD_FILE),"\n".join(myfavdict.values()))	1864	portage.write_atomic(os.path.join(portage.root, portage.WORLD_FILE.lstrip(os.sep)),"\n".join(myfavdict.values()))
1865		1865
1866	portage.mtimedb["resume"]["mergelist"]=mymergelist[:]	1866	portage.mtimedb["resume"]["mergelist"]=mymergelist[:]
1867		1867
Lines 2032-2038 Link Here
2032	myfavdict[myfavkey]=myfavkey	2032	myfavdict[myfavkey]=myfavkey
2033	print ">>> Recording",myfavkey,"in \"world\" favorites file..."	2033	print ">>> Recording",myfavkey,"in \"world\" favorites file..."
2034	emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Updating world file ("+x[pkgindex]+")")	2034	emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Updating world file ("+x[pkgindex]+")")
2035	portage.write_atomic(os.path.join(myroot,portage.WORLD_FILE),"\n".join(myfavdict.values()))	2035	portage.write_atomic(os.path.join(myroot, portage.WORLD_FILE.lstrip(os.sep)),"\n".join(myfavdict.values()))
2036		2036
2037	if ("noclean" not in portage.features) and (x[0] != "binary"):	2037	if ("noclean" not in portage.features) and (x[0] != "binary"):
2038	short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean Post"	2038	short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean Post"

Return to bug 124471