From f411e67edd2803b8f5bafe111d326a3a9d71eba5 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
Date: Thu, 10 Sep 2015 17:20:27 +0000
Subject: reproducible: build: requque a package for building in case of
 outadated builder and exit cleanly

---
 bin/reproducible_build.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0b8eec6f..3453d319 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -598,11 +598,10 @@ build_rebuild() {
 	fi
 	if [ ! -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] && [ -f b1/${SRCPACKAGE}_*_${ARCH}.changes ] ; then
 			echo "Version mismatch between main node (${SRCPACKAGE}_${EVERSION}_${ARCH}.dsc expected) and first build node ($(ls b1/*dsc)) for $SUITE/$ARCH, aborting. Please upgrade the schroots..." | tee -a ${RBUILDLOG}
-			# FIXME: this is wrong / not optimal, the build should be aborted cleanly and the package rescheduled, not depwait.
-			FTBFS=0
-		        calculate_build_duration
-			update_db_and_html "404"
-			handle_unhandled "Build of ${SRCPACKAGE} for $SUITE/$ARCH needs to be rescheduled" "5m"
+			# reschedule the package for later and quit the build without saving anything
+			sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started='' builder='' date_scheduled='$(date -u)' WHERE package_id='$SRCPKGID'"
+			NOTIFY=""
+			exit 0
 	elif [ -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
 		# the first build did not FTBFS, try rebuild it.
 		check_for_race_conditions
-- 
cgit v1.2.3-54-g00ecf