From a9bd5937aa8d5e46e6db875b0175586324a03589 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 26 Sep 2015 13:10:41 +0200 Subject: reproducible: try harder. sigh --- bin/reproducible_build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 6db5b32c..5499f462 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -394,9 +394,9 @@ choose_package() { echo "ok, $SRCPACKAGE is not building anywhere…" # try to update the schedule with our build attempt, then check no else did it, if so, abort sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started='$DATE', builder='$BUILDER' WHERE package_id='$SRCPKGID' AND date_build_started='' AND (builder='' OR builder='TBD')" - RESULT=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT date_build_started FROM schedule WHERE package_id='$SRCPKGID' AND date_build_started='$DATE' AND builder='$BUILDER'") - if [ -z "$RESULT" ] ; then - echo "hm, seems $SRCPACKAGE is building somewhere… failed to update the schedule table with our build." + local UPDATERESULT=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT date_build_started FROM schedule WHERE package_id='$SRCPKGID' AND date_build_started='$DATE' AND builder='$BUILDER'") + if [ -z "$UPDATERESULT" ] ; then + echo "hm, seems $SRCPACKAGE is building somewhere… failed to update the schedule table with our build ($SRCPKGID, $DATE, $BUILDER)." handle_race_condition fi else -- cgit v1.2.3-54-g00ecf