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

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

diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index e6285b6e4ff..ea8c47b6275 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -23,6 +23,15 @@ genpkg() {
 		return 0
 	fi
 
+	# Lock binpkg
+	unlock_binpkg() {
+	    if [ -f "$pkgdir/${binpkg}.lock" ]; then
+		   msg_normal "Unlocking ${binpkg}.lock because an error occurred during $binpkg creation"
+		   rm -f $pkgdir/${binpkg}.lock
+	    fi
+	}
+
+	trap unlock_binpkg ERR EXIT
 	touch -f $pkgdir/${binpkg}.lock
 
 	if [ ! -d $pkgdir ]; then
@@ -87,7 +96,9 @@ genpkg() {
 		${PKGDESTDIR}
 	rval=$?
 
+	# Unlock binpkg
 	rm -f $pkgdir/${binpkg}.lock
+	trap - ERR EXIT
 
 	if [ $rval -ne 0 ]; then
 		rm -f $pkgdir/$binpkg