wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xbps-src: fixed dangling binpkg lock on error

Browse source 
Co-authored-by: Noah Huppert <contact@noahh.io>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #24191 [via git-merge-pr]
This commit is contained in:
Noah Huppert 2020-08-10 12:46:56 -04:00 • committed by Andrew J. Hesford
parent 19fdc63a6e
commit 984fa5d9cb
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/hooks/do-pkg/00-gen-pkg.sh
View file

@ -4,6 +4,7 @@ genpkg() {
local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5" local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5"
local _preserve _deps _shprovides _shrequires _gitrevs _provides _conflicts local _preserve _deps _shprovides _shrequires _gitrevs _provides _conflicts
local _replaces _reverts _mutable_files _conf_files f local _replaces _reverts _mutable_files _conf_files f
local _pkglock="$pkgdir/${binpkg}.lock"
if [ ! -d "${PKGDESTDIR}" ]; then if [ ! -d "${PKGDESTDIR}" ]; then
msg_warn "$pkgver: cannot find pkg destdir... skipping!\n" msg_warn "$pkgver: cannot find pkg destdir... skipping!\n"
@ -12,7 +13,7 @@ genpkg() {
[ ! -d $pkgdir ] && mkdir -p $pkgdir [ ! -d $pkgdir ] && mkdir -p $pkgdir
while [ -f $pkgdir/${binpkg}.lock ]; do while [ -f "$_pkglock" ]; do
msg_warn "${pkgver}: binpkg is being created, waiting for 1s...\n" msg_warn "${pkgver}: binpkg is being created, waiting for 1s...\n"
sleep 1 sleep 1
done done
@ -23,7 +24,9 @@ genpkg() {
return 0 return 0
fi fi
touch -f $pkgdir/${binpkg}.lock # Lock binpkg
trap "rm -f '$_pkglock'" ERR EXIT
touch -f "$_pkglock"
if [ ! -d $pkgdir ]; then if [ ! -d $pkgdir ]; then
mkdir -p $pkgdir mkdir -p $pkgdir
@ -87,7 +90,9 @@ genpkg() {
${PKGDESTDIR} ${PKGDESTDIR}
rval=$? rval=$?
rm -f $pkgdir/${binpkg}.lock # Unlock binpkg
rm -f "$_pkglock"
trap - ERR EXIT
if [ $rval -ne 0 ]; then if [ $rval -ne 0 ]; then
rm -f $pkgdir/$binpkg rm -f $pkgdir/$binpkg