From 430708e79557eb9cb83b051019a62e6c32a6b89c Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 8 Oct 2014 11:49:21 +0200 Subject: reproducible: don't schedule new versions of blacklisted packages --- bin/reproducible_build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index e2e6df1e..2d34581f 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -57,7 +57,8 @@ if [ $1 = "unknown" ] ; then elif [ $1 = "known" ] ; then update_sources_table AMOUNT=$2 - PACKAGES=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT DISTINCT source_packages.name FROM source_packages,sources WHERE sources.version IN (SELECT version FROM sources WHERE name=source_packages.name ORDER by sources.version DESC LIMIT 1) AND (( source_packages.status = 'unreproducible' OR source_packages.status = 'FTBFS') AND source_packages.name = sources.name AND source_packages.version < sources.version) ORDER BY source_packages.build_date LIMIT $AMOUNT" | xargs -r echo) + # FIXME: blacklisted is a valid status in the db which should be used... + PACKAGES=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT DISTINCT source_packages.name FROM source_packages,sources WHERE sources.version IN (SELECT version FROM sources WHERE name=source_packages.name ORDER by sources.version DESC LIMIT 1) AND (( source_packages.status = 'unreproducible' OR source_packages.status = 'FTBFS') AND source_packages.name = sources.name AND source_packages.version < sources.version) ORDER BY source_packages.build_date LIMIT $AMOUNT" | egrep -v "^(linux|cups|zurl|openclipart)$" | xargs -r echo) else # CANDIDATES is defined in that file . /srv/jenkins/bin/reproducible_candidates.sh @@ -69,6 +70,7 @@ else continue fi PKG=${CANDIDATES[$i]} + # FIXME: blacklisted is a valid status in the db which should be used... RESULT=$(sqlite3 ${PACKAGES_DB} "SELECT name FROM source_packages WHERE name = \"${PKG}\"") if [ "$RESULT" = "" ] ; then PACKAGES="${PACKAGES} $PKG" -- cgit v1.2.3-70-g09d2