[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: dont try to build package on amd64 if there is more than one architecture to build for but 'all' is the only suitable one for this host

[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 c1157ef4d7b376897ef20488ab8fb6e08f121e6b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Mar 28 02:21:04 2015 +0100

    reproducible: dont try to build package on amd64 if there is more than one architecture to build for but 'all' is the only suitable one for this host
---
 bin/reproducible_build.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 70cb38a..a18119b 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -235,11 +235,14 @@ else
 		ARCHITECTURES=$(grep "^Architecture: " ${SRCPACKAGE}_*.dsc| cut -d " " -f2- | sed -s "s# #\n#g" | sort -u)
 		set +x
 		for arch in ${ARCHITECTURES} ; do
-			if [ "$arch" = "any" ] || [ "$arch" = "all" ] || [ "$arch" = "amd64" ] || [ "$arch" = "linux-any" ] || [ "$arch" = "linux-amd64" ] || [ "$arch" = "any-amd64" ] ; then
+			if [ "$arch" = "any" ] || [ "$arch" = "amd64" ] || [ "$arch" = "linux-any" ] || [ "$arch" = "linux-amd64" ] || [ "$arch" = "any-amd64" ] ; then
 				SUITABLE=true
 				break
 			fi
 		done
+		if [ "${ARCHITECTURES}" = "all" ] ; then
+			SUITABLE=true
+		fi
 		if ! $SUITABLE ; then
 			set -x
 			sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO results (package_id, version, status, build_date, build_duration) VALUES ('${SRCPKGID}', '${VERSION}', 'not for us', '$DATE', '')"

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