--- archbuild	2016-10-27 16:21:47.636764280 +0200
+++ /usr/bin/archbuild	2016-10-27 17:28:37.048181689 +0200
@@ -287,6 +287,7 @@
 # Pass all arguments after -- right to makepkg
 makechrootpkg_args+=("${@:$OPTIND}")
 
+lock 8 "${chroots}/${repo}-${arch}.lock" "Locking ${repo}-${arch}"
 if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 	msg "Creating chroot for [${repo}] (${arch})..."
 
@@ -310,7 +311,9 @@
 		-M "/usr/share/devtools/makepkg-${arch}.conf" \
 		"${chroots}/${repo}-${arch}/root" \
 		"${base_packages[@]}" || abort
+  exec 8>&-
 else
+  exec 8>&-
 	lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot"
 	arch-nspawn \
 		-C "/usr/share/devtools/pacman-${repo}.conf" \