From d073da7d3aa30cd22940faec3e32de640a43e73d Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 13 Nov 2017 15:40:06 +0100 Subject: exit more often and more silent if build-master-sanity existent --- bin/build-master-status | 5 +++++ bin/cleanup | 2 +- bin/db-update | 2 +- bin/delete-packages | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/build-master-status b/bin/build-master-status index 15df41c..719b22b 100755 --- a/bin/build-master-status +++ b/bin/build-master-status @@ -55,6 +55,11 @@ if [ $# -ne 0 ]; then usage fi +if [ -s "${work_dir}/build-master-sanity" ]; then + >&2 echo 'Build master is not sane.' + exit +fi + tmp_dir=$(mktemp -d) trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT diff --git a/bin/cleanup b/bin/cleanup index d0e7bee..a7589de 100755 --- a/bin/cleanup +++ b/bin/cleanup @@ -14,7 +14,7 @@ fi if [ -s "${work_dir}/build-master-sanity" ]; then >&2 echo 'Build master is not sane.' - exit 1 + exit fi # remove blocked/broken/locked markes of packages not on the buildlist anymore diff --git a/bin/db-update b/bin/db-update index 279e44f..366b705 100755 --- a/bin/db-update +++ b/bin/db-update @@ -386,7 +386,7 @@ fi if [ -s "${work_dir}/build-master-sanity" ]; then >&2 echo 'Build master is not sane.' - exit 1 + exit fi tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX") diff --git a/bin/delete-packages b/bin/delete-packages index 752c3fa..124e403 100755 --- a/bin/delete-packages +++ b/bin/delete-packages @@ -64,7 +64,7 @@ done if [ -s "${work_dir}/build-master-sanity" ]; then >&2 echo 'Build master is not sane.' - exit 1 + exit fi tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX") -- cgit v1.2.3