From 809c6682d04a23b0fe886c6986b708483ae54912 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 24 May 2015 09:34:42 +0200 Subject: reproducible: fixup: make get_source_package() more robust --- bin/reproducible_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 89872a0f..c9cb1e2d 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -357,7 +357,7 @@ get_source_package() { local RESULT schroot --directory $PWD -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source source ${SRCPACKAGE} 2>&1 | tee -a ${RBUILDLOG} RESULT=$? - if [ $RESULT != 0 ] || [ ! test $(ls ${SRCPACKAGE}_*.dsc 2>&1 /dev/null) ] ; then + if [ $RESULT != 0 ] || [ "$(ls ${SRCPACKAGE}_*.dsc 2> /dev/null)" = "" ] ; then # sometimes apt-get cannot download a package for whatever reason. # if so, wait some time and try again. only if that fails, give up. echo "Download of ${SRCPACKAGE} sources from ${SUITE} failed." | tee -a ${RBUILDLOG} @@ -367,7 +367,7 @@ get_source_package() { schroot --directory $PWD -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source source ${SRCPACKAGE} 2>&1 | tee -a ${RBUILDLOG} RESULT=$? fi - if [ $RESULT != 0 ] || [ ! test $(ls ${SRCPACKAGE}_*.dsc 2>&1 /dev/null) ] ; then + if [ $RESULT != 0 ] || [ "$(ls ${SRCPACKAGE}_*.dsc 2> /dev/null)" = "" ] ; then handle_404 fi } -- cgit v1.2.3-70-g09d2