From 0cd9e1ae7e9d52b0aa5896336c692fc2111554bd Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 16 Jun 2012 15:24:16 +0200
Subject: archbuild: use flock -n as we do elsewhere

---
 archbuild.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'archbuild.in')

diff --git a/archbuild.in b/archbuild.in
index fb1ae17..1501a9e 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -43,9 +43,12 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 		[[ -d $copy ]] || continue
 		msg2 "Deleting chroot copy '$(basename "${copy}")'..."
 
-		# Lock the copy
-		exec 9>"${copy}.lock"
-		flock 9
+		exec 9>"$copydir.lock"
+		if ! flock -n 9; then
+			stat_busy "Locking chroot copy '$copy'"
+			flock 9
+			stat_done
+		fi
 
 		{ type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
 		rm -rf "${copy}"
-- 
cgit v1.2.3-54-g00ecf