Attachment #81293 for bug #124471

Lines 5898-5904 Link Here

(-)pym/portage.py.orig (-2 / +2 lines)
5898	os.chown(pdir, 0, portage_gid)	5898	os.chown(pdir, 0, portage_gid)
5899	os.chmod(pdir, 02770)	5899	os.chmod(pdir, 02770)
5900		5900
5901	write_atomic(os.path.join(self.myroot,WORLD_FILE),"\n".join(newworldlist))	5901	write_atomic(self.myroot+WORLD_FILE,"\n".join(newworldlist)+"\n")
5902		5902
5903	#do original postrm	5903	#do original postrm
5904	if myebuildpath and os.path.exists(myebuildpath):	5904	if myebuildpath and os.path.exists(myebuildpath):
Lines 6928-6934 Link Here
6928	sys.stdout.write("p")	6928	sys.stdout.write("p")
6929	sys.stdout.flush()	6929	sys.stdout.flush()
6930		6930
6931	write_atomic(WORLD_FILE,"\n".join(worldlist))	6931	write_atomic(WORLD_FILE,"\n".join(worldlist)+"\n")
6932		6932
6933	for x in update_files:	6933	for x in update_files:
6934	mydblink = dblink('','','/',settings)	6934	mydblink = dblink('','','/',settings)

Lines 1885-1891 Link Here

(-)bin/emerge.orig (-2 / +2 lines)
1885	myfavdict[myfavkey]=myfavkey	1885	myfavdict[myfavkey]=myfavkey
1886	print ">>> Recording",myfavkey,"in \"world\" favorites file..."	1886	print ">>> Recording",myfavkey,"in \"world\" favorites file..."
1887	if not "--fetchonly" in myopts:	1887	if not "--fetchonly" in myopts:
1888	portage.write_atomic(os.path.join(portage.root,portage.WORLD_FILE),"\n".join(myfavdict.values()))	1888	portage.write_atomic(portage.root+portage.WORLD_FILE,"\n".join(myfavdict.values())+"\n")
1889		1889
1890	portage.mtimedb["resume"]["mergelist"]=mymergelist[:]	1890	portage.mtimedb["resume"]["mergelist"]=mymergelist[:]
1891		1891
Lines 2051-2057 Link Here
2051	myfavdict[myfavkey]=myfavkey	2051	myfavdict[myfavkey]=myfavkey
2052	print ">>> Recording",myfavkey,"in \"world\" favorites file..."	2052	print ">>> Recording",myfavkey,"in \"world\" favorites file..."
2053	emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Updating world file ("+x[pkgindex]+")")	2053	emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Updating world file ("+x[pkgindex]+")")
2054	portage.write_atomic(os.path.join(myroot,portage.WORLD_FILE),"\n".join(myfavdict.values()))	2054	portage.write_atomic(myroot+portage.WORLD_FILE,"\n".join(myfavdict.values())+"\n")
2055		2055
2056	if ("noclean" not in portage.features) and (x[0] != "binary"):	2056	if ("noclean" not in portage.features) and (x[0] != "binary"):
2057	short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean Post"	2057	short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean Post"

Return to bug 124471