Merge commit 'a7a0': merge our and their lock functions

Arch's have shorter names, and properly escape the filename.
Ours create the directories, and check if the locks are already open.
The best of both worlds.

When merging the usages of them, I used arch's messages. Ours are too long,
even if they are more informative.

1 files changed, 2 insertions, 1 deletions

diff --git a/archbuild.in b/archbuild.in
index 38fb8bf..8e272a1 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -51,7 +51,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 		[[ -d $copy ]] || continue
 		msg2 "Deleting chroot copy '$(basename "${copy}")'..."
 
-		lock_open_write 9 "$copy.lock" "Locking chroot copy '$copy'"
+		lock 9 "$copy.lock" "Locking chroot copy '$copy'"
 
 		if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then
 			{ type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
@@ -68,6 +68,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 		"${chroots}/${repo}-${arch}/root" \
 		"${base_packages[@]}" || abort
 else
+	lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot"
 	setarch ${arch} arch-nspawn \
 		-C "@pkgdatadir@/pacman-${repo}.conf" \
 		-M "@pkgdatadir@/makepkg-${arch}.conf" \