From 4091756f7d973ea31703fc0726019bf6dc9352a9 Mon Sep 17 00:00:00 2001
From: Noah Huppert <contact@noahh.io>
Date: Mon, 10 Aug 2020 02:29:17 -0400
Subject: [PATCH] [ci skip] xbps-src: fixed dangling binpkg lock on error

---
 common/hooks/do-pkg/00-gen-pkg.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index e6285b6e4ff..e1893101ade 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -23,7 +23,14 @@ genpkg() {
 		return 0
 	fi
 
+	# Lock binpkg
+	unlock_binpkg() {
+	    msg_normal "Unlocking ${binpkg}.lock because an error occurred during $binpkg creation"
+	    rm -f $pkgdir/${binpkg}.lock
+	}
+
 	touch -f $pkgdir/${binpkg}.lock
+	trap unlock_binpkg ERR EXIT
 
 	if [ ! -d $pkgdir ]; then
 		mkdir -p $pkgdir
@@ -60,6 +67,7 @@ genpkg() {
 	#
 	# Create the XBPS binary package.
 	#
+	sleep 100
 	xbps-create \
 		${_provides:+--provides "${_provides}"} \
 		${_conflicts:+--conflicts "${_conflicts}"} \
@@ -87,6 +95,8 @@ genpkg() {
 		${PKGDESTDIR}
 	rval=$?
 
+	# Unlock binpkg
+	trap - ERR
 	rm -f $pkgdir/${binpkg}.lock
 
 	if [ $rval -ne 0 ]; then