[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: make get_source_package() more robust

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit e4288934c4e3b734468c9112f5692a7d502f2230
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 23 11:25:34 2015 +0200

    reproducible: make get_source_package() more robust
---
 bin/reproducible_build.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index ec7acff..4962c3c 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -352,9 +352,10 @@ init() {
 }
 
 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}
-	local RESULT=$?
-	if [ $RESULT != 0 ] ; then
+	RESULT=$?
+	if [ $RESULT != 0 ] || [ ! $(ls ${SRCPACKAGE}_*.dsc > /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}
@@ -364,7 +365,9 @@ 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 ] ; then handle_404 ; fi
+	if [ $RESULT != 0 ] || [ ! $(ls ${SRCPACKAGE}_*.dsc > /dev/null) ] ; then
+		handle_404
+	fi
 }
 
 check_suitability() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git