summaryrefslogtreecommitdiff
path: root/bin/copy-to-build-support
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-01-31 09:34:56 +0100
committerErich Eckner <git@eckner.net>2020-01-31 09:44:57 +0100
commitb2554880deb779f50aa82e73b247edf3a63b8837 (patch)
tree05003f4f29c58d03e92af987444f9280291e78ce /bin/copy-to-build-support
parent8048b29f90d956a295349d03ab91dcbd23106d34 (diff)
downloadbuilder-b2554880deb779f50aa82e73b247edf3a63b8837.tar.xz
lib/intentions-queue: make intentions_left() work similar to flock and verbose_flock()
Diffstat (limited to 'bin/copy-to-build-support')
-rwxr-xr-xbin/copy-to-build-support13
1 files changed, 3 insertions, 10 deletions
diff --git a/bin/copy-to-build-support b/bin/copy-to-build-support
index bb7e421..0dcc298 100755
--- a/bin/copy-to-build-support
+++ b/bin/copy-to-build-support
@@ -77,16 +77,9 @@ verbose_flock -s ${wait_for_lock} 9
exec 8> "${package_database_lock_file}"
verbose_flock ${wait_for_lock} 8
-if [ -z "${wait_for_lock}" ]; then
- while intentions_left; do
- >&2 echo 'There are still intentions in the queue.'
- sleep 1
- done
-else
- if intentions_left; then
- >&2 echo 'come back (shortly) later - There are still intentions in the queue.'
- exit 1
- fi
+if intentions_left ${wait_for_lock}; then
+ >&2 echo 'come back (shortly) later - There are still intentions in the queue.'
+ exit 1
fi
tmp_dir=$(mktemp -d "${work_dir}/tmp.copy-to-build-support.0.XXXXXXXXXX")