summaryrefslogtreecommitdiff
path: root/bin/build-packages
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-12 16:36:29 +0200
committerErich Eckner <git@eckner.net>2018-09-12 16:36:29 +0200
commitad267ce6efe34f218490c41ef92e02c1f44efeea (patch)
tree2ef64be053a4d9213efe4e6882056f296a1db590 /bin/build-packages
parentddf595ef3b3cfdb830404b60d10424c689525442 (diff)
downloadbuilder-ad267ce6efe34f218490c41ef92e02c1f44efeea.tar.xz
bin/build-packages: transmit arch to return-assignment, so that build-assignment can be better verified
Diffstat (limited to 'bin/build-packages')
-rwxr-xr-xbin/build-packages11
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/build-packages b/bin/build-packages
index 982a908..ecf98e7 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -683,7 +683,7 @@ while [ "${count}" -ne 0 ] && \
-i "${master_build_server_identity}" \
-p "${master_build_server_port}" \
"${master_build_server_user}@${master_build_server}" \
- 'return-assignment' "${package}" "${git_revision}" "${mod_git_revision}" "${repository}" "${sub_pkgrel}" \
+ 'return-assignment' "${package}" "${git_revision}" "${mod_git_revision}" "${repository}" "${arch}" "${sub_pkgrel}" \
< 'package.tar' || \
err=$?
case ${err} in
@@ -707,6 +707,10 @@ while [ "${count}" -ne 0 ] && \
>&2 echo "'return-assignment' reports too many or missing packages."
exit 1
;;
+ 5)
+ >&2 echo "'return-assignment' was called with wrong arguments."
+ exit 1
+ ;;
*)
>&2 echo "unknown return code ${err} from 'return-assignment'"
wait_some_time 60
@@ -739,7 +743,7 @@ while [ "${count}" -ne 0 ] && \
-i "${master_build_server_identity}" \
-p "${master_build_server_port}" \
"${master_build_server_user}@${master_build_server}" \
- 'return-assignment' "${package}" "${git_revision}" "${mod_git_revision}" "${repository}" 'ERROR' \
+ 'return-assignment' "${package}" "${git_revision}" "${mod_git_revision}" "${repository}" "${arch}" 'ERROR' \
< 'build-logs.gz.tar' || \
err=$?
case ${err} in
@@ -755,6 +759,9 @@ while [ "${count}" -ne 0 ] && \
>&2 echo 'I was too slow, the package is outdated. I will continue ...'
break
;;
+ 4)
+ >&2 echo '"return-assignment" was called with wrong arguments.'
+ ;;
*)
>&2 echo "unknown return code ${err} from 'return-assignment'"
wait_some_time 60