[patch] use prelink --verify and also use mkstemp to avoid need for lock file

prelink-cksum.patch (text/plain), 1.44 KB, created by Zac Medico on 2007-09-24 20:38:28 UTC

Index: pym/portage_checksum.py
===================================================================
--- pym/portage_checksum.py	(revision 7801)
+++ pym/portage_checksum.py	(working copy)
@@ -10,6 +10,7 @@
 import os
 import errno
 import stat
+import tempfile
 import portage_exception
 import portage_exec
 import portage_locks
@@ -201,16 +202,19 @@
 	"""
 	global prelink_capable
 	myfilename      = filename[:]
-	prelink_tmpfile = os.path.join("/", PRIVATE_PATH, "prelink-checksum.tmp." + str(os.getpid()))
+	prelink_tmpfile = None
 	mylock          = None
 	try:
 		if calc_prelink and prelink_capable:
-			mylock = portage_locks.lockfile(prelink_tmpfile, wantnewlockfile=1)
 			# Create non-prelinked temporary file to checksum.
 			# Files rejected by prelink are summed in place.
 			try:
-				retval = portage_exec.spawn([PRELINK_BINARY, "--undo", "-o",
-					prelink_tmpfile, filename], fd_pipes={})
+				tmpfile_fd, prelink_tmpfile = tempfile.mkstemp()
+				try:
+					retval = portage_exec.spawn([PRELINK_BINARY,
+						"--verify", filename], fd_pipes={1:tmpfile_fd})
+				finally:
+					os.close(tmpfile_fd)
 				if retval == os.EX_OK:
 					myfilename = prelink_tmpfile
 			except portage_exception.CommandNotFound:
@@ -225,7 +229,7 @@
 			if e.errno == errno.ENOENT:
 				raise portage_exception.FileNotFound(myfilename)
 			raise
-		if calc_prelink and prelink_capable:
+		if prelink_tmpfile:
 			try:
 				os.unlink(prelink_tmpfile)
 			except OSError, e: