From ad267ce6efe34f218490c41ef92e02c1f44efeea Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 12 Sep 2018 16:36:29 +0200 Subject: bin/build-packages: transmit arch to return-assignment, so that build-assignment can be better verified --- bin/build-packages | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'bin/build-packages') 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 -- cgit v1.2.3-70-g09d2