From df1a96537e43fcc3a5c4f5f3a20f1d7de1b1c302 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 21 May 2015 02:01:57 +0200 Subject: reproducible: handle 404 correctly --- bin/reproducible_build.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index fbfb5bc3..f6c26b9e 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -142,11 +142,16 @@ handle_404() { echo "Warning: Download of ${SRCPACKAGE} sources from ${SUITE} failed." | tee -a ${RBUILDLOG} ls -l ${SRCPACKAGE}* | tee -a ${RBUILDLOG} echo "Warning: Maybe there was a network problem, or ${SRCPACKAGE} is not a source package in ${SUITE}, or it was removed or renamed. Please investigate." | tee -a ${RBUILDLOG} + irc_message "$BUILD_URL encountered a 404 problem." DURATION='' + EVERSION="None" + chmod 644 $RBUILDLOG + mv $RBUILDLOG $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log + RBUILDLOG=$BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log update_db_and_html "404" if [ $SAVE_ARTIFACTS -eq 1 ] ; then SAVE_ARTIFACTS=0 ; fi if [ ! -z "$NOTIFY" ] ; then NOTIFY="failure" ; fi - exit 0 + exit 0 # RBUILDLOG and SAVE_ARTIFACTS and NOTIFY are used in cleanup_all called at exit } handle_not_for_us() { @@ -454,8 +459,8 @@ LOCKFILE="/tmp/${SUITE}-${ARCH}-${SRCPACKAGE}" init get_source_package -VERSION=$(grep "^Version: " ${SRCPACKAGE}_*.dsc| head -1 | egrep -v '(GnuPG v|GnuPG/MacGPG2)' | cut -d " " -f2-) -EVERSION=$(echo $VERSION | cut -d ":" -f2) # EPOCH_FREE_VERSION was too long +VERSION="$(grep '^Version: ' ${SRCPACKAGE}_*.dsc| head -1 | egrep -v '(GnuPG v|GnuPG/MacGPG2)' | cut -d ' ' -f2-)" +EVERSION="$(echo $VERSION | cut -d ':' -f2)" # EPOCH_FREE_VERSION was too long DBDREPORT="${SRCPACKAGE}_${EVERSION}.debbindiff.html" BUILDINFO="${SRCPACKAGE}_${EVERSION}_${ARCH}.buildinfo" -- cgit v1.2.3-54-g00ecf