[patch] Temporary work-around patch

0001-Add-a-lock-file-for-checking-out-as-a-temporary-work.patch (text/plain), 1.32 KB, created by Michał Górny on 2013-10-26 14:51:43 UTC

From 67ad6a92ec45e0d37f5e3c88b6415c63e071ffc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[e-mail]>
Date: Sat, 26 Oct 2013 16:51:03 +0200
Subject: [PATCH] Add a lock file for checking out as a temporary workaround.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=489280
---
 eclass/git-r3.eclass | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index fd6886f..7206797 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -579,9 +579,25 @@ git-r3_checkout() {
 		fi
 	fi
 
+	# Note: this is a hack to avoid parallel checkout issues.
+	# I will try to handle it without locks when I have more time.
+	local lockfile=${GIT_DIR}/.git-r3_checkout_lock
+	local lockfile_l=${lockfile}.${BASHPID}
+	touch "${lockfile_l}" || die
+	until ln "${lockfile_l}" "${lockfile}" &>/dev/null; do
+		sleep 1
+	done
+	rm "${lockfile_l}" || die
+
 	set -- git checkout -f "${local_id}"/__main__ .
 	echo "${@}" >&2
-	"${@}" || die "git checkout ${local_id}/__main__ failed"
+	"${@}"
+	local ret=${?}
+
+	# Remove the lock!
+	rm "${lockfile}" || die
+
+	[[ ${ret} == 0 ]] || die "git checkout ${local_id}/__main__ failed"
 
 	# diff against previous revision (if any)
 	local new_commit_id=$(git rev-parse --verify "${local_id}"/__main__)
-- 
1.8.4