[patch] fixed version of the above patch

portage-2.2.00.14771-busy-paths.patch (text/plain), 908 bytes, created by Markus Duft (RETIRED) on 2010-07-28 15:15:42 UTC

diff -ru portage.orig/pym/portage/busy.py portage/pym/portage/busy.py
--- portage.orig/pym/portage/busy.py	2010-07-28 09:01:47 +0200
+++ portage/pym/portage/busy.py	2010-07-27 15:58:45 +0200
@@ -32,12 +32,12 @@
 
 		self.cleanBusyFiles()
 	
-	def getDestFilename(self, srcfile):
+	def getDestFilename(self, destdir, srcfile):
 		"""calculate a destination filename based on the srcfile filename."""
 		my_fn = ".$busy-" + srcfile + "."
 		my_num = 0
 		
-		while os.access(my_fn + str(my_num), os.F_OK):
+		while os.access(os.path.join(destdir, my_fn + str(my_num)), os.F_OK):
 			my_num += 1
 
 		return my_fn + str(my_num)
@@ -57,7 +57,7 @@
 		dst_dir = os.path.dirname(srcfile)
 		src_nam = os.path.basename(srcfile)
 
-		destfile = os.path.join(dst_dir, self.getDestFilename(src_nam))
+		destfile = os.path.join(dst_dir, self.getDestFilename(dst_dir, src_nam))
 
 		try:
 			os.rename(srcfile, destfile)