[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/

["Zac Medico" <zmedico@gentoo.org>]

commit:     9ed00a9e70a3705164a5349145ff467e5c40ddfd
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 22:38:00 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 14 22:38:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9ed00a9e

prepstrip: fix hardlink race in process_elf

---
 bin/ebuild-helpers/prepstrip |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 6f2c742..deb5cab 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -137,12 +137,7 @@ save_elf_debug() {
 		local args="a-x,o-w"
 		[[ -g ${x} || -u ${x} ]] && args+=",go-r"
 		chmod ${args} "${y}"
-		if ! ln "${y}" "${inode}" ; then
-			# This means a parallel process has already created the
-			# inode link. So, replace ${y} with a link to that inode.
-			rm -f "${y}"
-			ln "${inode}" "${y}"
-		fi
+		ln "${y}" "${inode}"
 	fi
 
 	# if we don't already have build-id from debugedit, look it up
@@ -168,6 +163,20 @@ process_elf() {
 	save_elf_sources "${x}"
 
 	if ${strip_this} ; then
+
+		# If two processes try to strip the same hardlink at the same
+		# time, it will cause one of them to lose the splitdebug info.
+		# So, use a lockfile to prevent interference (easily observed
+		# with dev-vcs/git which creates ~109 hardlinks to one file in
+		# /usr/libexec/git-core).
+		local lockfile=$(inode_file_link "${x}")_lockfile
+		if ! ln "${x}" "${lockfile}" ; then
+			while [[ -f ${lockfile} ]] ; do
+				sleep 1
+			done
+			unset lockfile
+		fi
+
 		# see if we can split & strip at the same time
 		if [[ -n ${SPLIT_STRIP_FLAGS} ]] ; then
 			local shortname="${x##*/}.debug"
@@ -181,6 +190,7 @@ process_elf() {
 			save_elf_debug "${x}"
 			${STRIP} ${strip_flags} "${x}"
 		fi
+		[[ -n ${lockfile} ]] && rm -f "${lockfile}"
 	fi
 }