summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-03-28 02:21:04 +0100
committerHolger Levsen <holger@layer-acht.org>2015-03-28 02:21:04 +0100
commitc1157ef4d7b376897ef20488ab8fb6e08f121e6b (patch)
treed34f76e51a92846971825b7cab7360408cc1aa62
parent5d024a1c183761e2c144d4b65680d0249ce7f0ca (diff)
downloadjenkins.debian.net-c1157ef4d7b376897ef20488ab8fb6e08f121e6b.tar.xz
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
-rwxr-xr-xbin/reproducible_build.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 70cb38a2..a18119b4 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', '')"