Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix handling of cowbuilder update lock #159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix handling of cowbuilder update lock #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions scripts/build-and-provide-package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,14 +367,11 @@ cowbuilder_init() {
return 0
fi

if ls "${update_lockfile}"* >/dev/null 2>&1 ; then
echo "*** Update run already taking place, skipping ***"
return 0
fi

(
# if we cannot get the lock then somebody else is already running
if ! flock --nonblock 9 ; then
# If we cannot get the lock then somebody else is already running. In this
# case we wait for up to 10 minutes. If we don't get the lock during that
# time we fail.
if ! flock --wait 600 9 ; then
exit 1
fi

Expand Down Expand Up @@ -406,8 +403,8 @@ cowbuilder_init() {
# depending on the exit code we have to distinguish between different failures
case "$?" in
1)
echo "*** Someone else is holding the lock file ${update_lockfile}, skipping create/update ***"
return 0
echo "*** Someone else is holding a lock (flock) on file ${update_lockfile} for more than 10 minutes. Giving up. ***"
bailout 1 "Error: Failed to acquire lock for cowbuilder update."
;;
2)
echo "*** Something went wrong with the creation of the cowbuilder environment. Cleaning up. ***"
Expand Down