summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-10-18 13:23:18 +0200
committerLuboš Luňák <l.lunak@suse.cz>2012-10-18 13:26:11 +0200
commitd02a864d0a8e0dcd621049854b54ed7ca5ffdcfe (patch)
tree0566c1f08f01fe00db78df24f564adbef58aea02
parenta09956d203493e83bda58acc8684df7713494190 (diff)
flock -n means non-blocking, so all this locking was pointless
-rw-r--r--bin/tinbuild_internals.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/tinbuild_internals.sh b/bin/tinbuild_internals.sh
index b1038da..9a63914 100644
--- a/bin/tinbuild_internals.sh
+++ b/bin/tinbuild_internals.sh
@@ -4,7 +4,7 @@
# License: GPLv3
#
-lock_file=/tmp/tinbuid-lockfile
+lock_file=/tmp/tinbuild-lockfile
push_opts="-a"
# Do we have timeout? If yes, guard git pull with that - which has a
@@ -546,7 +546,7 @@ local oc=""
[ $V ] && echo "deliver_to_bibisect()"
(
- do_flock -x -n 201
+ do_flock -x 201
if [ -n ${optdir} ] ; then
# verify that someone did not screw-up bibisect repo
@@ -588,7 +588,7 @@ local oc=""
[ $V ] && echo "unlock ${lock_file?}.bibisect"
# asynchhronously compact the bibisect repo, but still hold a lock to avoid try to mess with the reo while being compressed
(
- do_flock -x -n 201
+ do_flock -x 201
#close the upper-level lock
exec 200>&-
bibisect_gc
@@ -814,7 +814,7 @@ local retry_count
break
fi
(
- do_flock -x -n 200
+ do_flock -x 200
build_type=""
if [ "${next_priority?}" = "tb" ] ; then
check_for_commit
@@ -1000,7 +1000,7 @@ run_tb_loop()
break
fi
(
- do_flock -x -n 200
+ do_flock -x 200
if [ "$retval" != "false_negative" ] ; then
check_for_commit