[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible debian: don't always build arch:all on "any" arch

[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 c8cdd98601e16a2215aa48773da4748281f1f7d5
Author: Steven Chamberlain <steven at pyro.eu.org>
Date:   Tue Feb 9 13:44:08 2016 +0000

    reproducible debian: don't always build arch:all on "any" arch
    
    If a package builds arch-dep parts on a restricted set of arches,
    don't assume the arch-indep parts can build on "any" arch.
    
    If a package *only* lists Architecture: all, keep the current behaviour:
    (linux-)amd64 will most likely work;  armhf is less likely but is nice
    to try anyway.
---
 bin/reproducible_build.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 4d5dd4b..7b11cef 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -525,8 +525,14 @@ check_suitability() {
 	# check whether the package is not for us...
 	local SUITABLE=false
 	local ARCHITECTURES=$(grep "^Architecture: " ${SRCPACKAGE}_*.dsc| cut -d " " -f2- | sed -s "s# #\n#g" | sort -u)
+
+	# packages that are *only* arch:all can be tried on any arch
+	if [ "$ARCHITECTURES" = "all" ]; then
+		ARCHITECTURES="any"
+	fi
+
 	for arch in ${ARCHITECTURES} ; do
-		if [ "$arch" = "any" ] || [ "$arch" = "$ARCH" ] || [ "$arch" = "linux-any" ] || [ "$arch" = "linux-$ARCH" ] || [ "$arch" = "any-$ARCH" ] || [ "$arch" = "all" ] ; then
+		if [ "$arch" = "any" ] || [ "$arch" = "$ARCH" ] || [ "$arch" = "linux-any" ] || [ "$arch" = "linux-$ARCH" ] || [ "$arch" = "any-$ARCH" ] ; then
 			SUITABLE=true
 			break
 		fi

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