[patch] portage-2.1_pre5--root+WORLDFILE.patch

portage-2.1_pre5--root+WORLDFILE.patch (text/plain), 1.78 KB, created by TGL on 2006-03-04 07:29:21 UTC

--- pym/portage.py.orig	2006-03-04 16:00:56.000000000 +0100
+++ pym/portage.py	2006-03-04 16:16:32.000000000 +0100
@@ -5898,7 +5898,7 @@
 				os.chown(pdir, 0, portage_gid)
 				os.chmod(pdir, 02770)
 
-			write_atomic(os.path.join(self.myroot,WORLD_FILE),"\n".join(newworldlist))
+			write_atomic(self.myroot+WORLD_FILE,"\n".join(newworldlist)+"\n")
 
 		#do original postrm
 		if myebuildpath and os.path.exists(myebuildpath):
@@ -6928,7 +6928,7 @@
 						sys.stdout.write("p")
 						sys.stdout.flush()
 
-	write_atomic(WORLD_FILE,"\n".join(worldlist))
+	write_atomic(WORLD_FILE,"\n".join(worldlist)+"\n")
 
 	for x in update_files:
 		mydblink = dblink('','','/',settings)
--- bin/emerge.orig	2006-03-04 11:44:22.000000000 +0100
+++ bin/emerge	2006-03-04 16:14:52.000000000 +0100
@@ -1885,7 +1885,7 @@
 							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(portage.root+portage.WORLD_FILE,"\n".join(myfavdict.values())+"\n")
 
 			portage.mtimedb["resume"]["mergelist"]=mymergelist[:]
 
@@ -2051,7 +2051,7 @@
 						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(myroot+portage.WORLD_FILE,"\n".join(myfavdict.values())+"\n")
 
 				if ("noclean" not in portage.features) and (x[0] != "binary"):
 					short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean Post"