summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2015-12-10 00:01:19 +0000
committerHolger Levsen <holger@layer-acht.org>2015-12-10 01:02:37 +0100
commitf48a6c40eac4c82b026c29a810fcc890c0f8b507 (patch)
treefd9512d4f695cd13b6f92a60b9d6caf5ce156537
parentc56600e2bdc107fc564c51bcc1eeb00118e48376 (diff)
downloadjenkins.debian.net-f48a6c40eac4c82b026c29a810fcc890c0f8b507.tar.xz
reproducible: build/maintenance: another cases of ='' => IS NULL
-rwxr-xr-xbin/reproducible_build.sh6
-rwxr-xr-xbin/reproducible_maintenance.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 8cf68fb3..959eb369 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -275,7 +275,7 @@ handle_reproducible() {
unregister_build() {
# unregister this build so it will immeditiatly tried again
- sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started='', job='' WHERE package_id='$SRCPKGID'"
+ sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started = NULL, job = NULL WHERE package_id='$SRCPKGID'"
NOTIFY=""
}
@@ -427,7 +427,7 @@ choose_package() {
# reproducible-stale-builds.log is mailed once a day by reproducible_maintenance.sh
echo "$(date -u) - stale builds found, cleaning db from these:" | tee -a $STALELOG
cat $BAD_BUILDS | tee -a $STALELOG
- sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started='', job='' WHERE job LIKE '${JOB_PREFIX}%'"
+ sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started = NULL, job = NULL WHERE job LIKE '${JOB_PREFIX}%'"
echo >> $STALELOG
fi
rm -f $BAD_BUILDS
@@ -693,7 +693,7 @@ build_rebuild() {
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}
# reschedule the package for later and quit the build without saving anything
- sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started='', job='', date_scheduled='$(date -u +'%Y-%m-%d %H:%M')' WHERE package_id='$SRCPKGID'"
+ sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started = NULL, job = NULL, date_scheduled='$(date -u +'%Y-%m-%d %H:%M')' WHERE package_id='$SRCPKGID'"
NOTIFY=""
exit 0
elif [ -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index 19da9311..755987d7 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -192,7 +192,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
SELECT s.id, s.name, p.date_scheduled, p.date_build_started
FROM schedule AS p JOIN sources AS s ON p.package_id=s.id
WHERE p.date_scheduled != ''
- AND p.date_build_started != ''
+ AND p.date_build_started IS NOT NULL
AND p.date_build_started < datetime('now', '-36 hours')
ORDER BY p.date_scheduled
"