From b6568d37c8be310b5a4821e0c1505635542b0b94 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 17 Apr 2019 14:04:02 +0200 Subject: bin/build-packages: -d should require, that the given package is indeed the prefered one --- bin/build-packages | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'bin/build-packages') diff --git a/bin/build-packages b/bin/build-packages index d2c3f3a..e2a972d 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -268,6 +268,19 @@ while [ "${count}" -ne 0 ] && \ arch="${my_arch}" fi + if [ -n "${diff_source_dir}" ] && + [ "${prefered_package}" != "${package}" ]; then + >&2 echo 'The prefered package was not handed out.' + >&2 echo 'Because -d was given, I will abort.' + # shellcheck disable=SC2029 + ssh \ + -i "${master_build_server_identity}" \ + -p "${master_build_server_port}" \ + "${master_build_server_user}@${master_build_server}" \ + 'return-assignment' 'ABORT' + exit 2 + fi + if [ -z "${forced_straws}" ] && \ printf '%s\n' "${package}" | \ grep -q '^\(haskell\|python2\?\)-'; then -- cgit v1.2.3-54-g00ecf