diff options
| author | Valerie R Young <spectranaut@riseup.net> | 2016-09-15 15:32:44 -0400 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-10-17 11:22:18 +0200 |
| commit | af23288244969b39b25e91a073b46f44e606d73e (patch) | |
| tree | 052bbe84613e812dcfa5fac410f44503314c06a5 /bin/reproducible_maintenance.sh | |
| parent | 078490603dea0a356c79fd448c5d5a861b218992 (diff) | |
| download | jenkins.debian.net-af23288244969b39b25e91a073b46f44e606d73e.tar.xz | |
reproducible debian: add and use query_db bash function
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/reproducible_maintenance.sh')
| -rwxr-xr-x | bin/reproducible_maintenance.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh index c9be3d10..30fb587e 100755 --- a/bin/reproducible_maintenance.sh +++ b/bin/reproducible_maintenance.sh @@ -204,7 +204,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then for pkg in $CANDIDATES ; do QUERY="SELECT s.name FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE s.suite='$SUITE' AND s.architecture='$ARCH' AND (r.status='FTBFS' OR r.status='depwait') AND s.name='$pkg'" - TO_SCHEDULE=${TO_SCHEDULE:+"$TO_SCHEDULE "}$(sqlite3 -init $INIT $PACKAGES_DB "$QUERY") + TO_SCHEDULE=${TO_SCHEDULE:+"$TO_SCHEDULE "}$(query_db "$QUERY") done schedule_packages $TO_SCHEDULE done @@ -252,7 +252,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then ORDER BY p.date_scheduled " PACKAGES=$(mktemp --tmpdir=$TEMPDIR maintenance-XXXXXXXXXXXX) - sqlite3 -init $INIT ${PACKAGES_DB} "$QUERY" > $PACKAGES 2> /dev/null || echo "Warning: SQL query '$QUERY' failed." + query_db "$QUERY" > $PACKAGES 2> /dev/null || echo "Warning: SQL query '$QUERY' failed." if grep -q '|' $PACKAGES ; then echo echo "Packages found where the build was started more than 48h ago:" @@ -260,7 +260,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then echo for PKG in $(cat $PACKAGES | cut -d "|" -f1) ; do echo "sqlite3 ${PACKAGES_DB} \"DELETE FROM schedule WHERE package_id = '$PKG';\"" - sqlite3 -init $INIT ${PACKAGES_DB} "DELETE FROM schedule WHERE package_id = '$PKG';" + query_db "DELETE FROM schedule WHERE package_id = '$PKG';" done echo "Packages have been removed from scheduling." echo @@ -275,7 +275,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then PACKAGES=$(mktemp --tmpdir=$TEMPDIR maintenance-XXXXXXXXXX) QUERY="SELECT name, suite, architecture FROM removed_packages LIMIT 25" - sqlite3 -init $INIT ${PACKAGES_DB} "$QUERY" > $PACKAGES 2> /dev/null || echo "Warning: SQL query '$QUERY' failed." + query_db "$QUERY" > $PACKAGES 2> /dev/null || echo "Warning: SQL query '$QUERY' failed." if grep -q '|' $PACKAGES ; then DIRTY=true echo @@ -289,7 +289,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then ARCH=$(echo "$pkg" | cut -d '|' -f 3) QUERY="DELETE FROM removed_packages WHERE name='$PKGNAME' AND suite='$SUITE' AND architecture='$ARCH'" - sqlite3 -init $INIT ${PACKAGES_DB} "$QUERY" + query_db "$QUERY" cd $DEBIAN_BASE find rb-pkg/$SUITE/$ARCH rbuild/$SUITE/$ARCH dbd/$SUITE/$ARCH dbdtxt/$SUITE/$ARCH buildinfo/$SUITE/$ARCH logs/$SUITE/$ARCH logdiffs/$SUITE/$ARCH -name "${PKGNAME}_*" | xargs -r rm -v || echo "Warning: couldn't delete old files from ${PKGNAME} in $SUITE/$ARCH" done |