From de9728267ea993ead851e4ed1cb69b7474daf0df Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 11 Jun 2018 10:30:26 +0200 Subject: bin/interpret-mail: reorder tasks alphabetically --- bin/interpret-mail | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'bin/interpret-mail') diff --git a/bin/interpret-mail b/bin/interpret-mail index e2031cb..4a290d8 100755 --- a/bin/interpret-mail +++ b/bin/interpret-mail @@ -263,22 +263,14 @@ if [ -s "${tmp_dir}/block" ]; then fi fi -if [ -s "${tmp_dir}/stabilize" ]; then +if [ -s "${tmp_dir}/copy-to-build-support" ]; then sed -i ' /\.pkg\.tar\.xz$/!s/$/.pkg.tar.xz/ - ' "${tmp_dir}/stabilize" - if run_and_log_on_error 'stabilize' "${base_dir}/bin/modify-package-state" --wait --tested "${tmp_dir}/stabilize"; then - log 1 'stabilize' "$(wc -l < "${tmp_dir}/stabilize")" - else - log 0 'stabilize' 0 - fi -fi - -if [ -s "${tmp_dir}/unblock" ]; then - if run_and_log_on_error 'unblock' "${base_dir}/bin/modify-package-state" --wait --unblock "${tmp_dir}/unblock"; then - log 1 'unblock' "$(wc -l < "${tmp_dir}/unblock")" + ' "${tmp_dir}/copy-to-build-support" + if run_and_log_on_error 'copy-to-build-support' "${base_dir}/bin/copy-to-build-support" --wait "${tmp_dir}/copy-to-build-support"; then + log 1 'copy-to-build-support' "$(wc -l < "${tmp_dir}/copy-to-build-support")" else - log 0 'unblock' 0 + log 0 'copy-to-build-support' 0 fi fi @@ -296,13 +288,21 @@ if [ -s "${tmp_dir}/schedule" ]; then log 1 'schedule' "$(wc -l < "${tmp_dir}/schedule")" fi -if [ -s "${tmp_dir}/copy-to-build-support" ]; then +if [ -s "${tmp_dir}/stabilize" ]; then sed -i ' /\.pkg\.tar\.xz$/!s/$/.pkg.tar.xz/ - ' "${tmp_dir}/copy-to-build-support" - if run_and_log_on_error 'copy-to-build-support' "${base_dir}/bin/copy-to-build-support" --wait "${tmp_dir}/copy-to-build-support"; then - log 1 'copy-to-build-support' "$(wc -l < "${tmp_dir}/copy-to-build-support")" + ' "${tmp_dir}/stabilize" + if run_and_log_on_error 'stabilize' "${base_dir}/bin/modify-package-state" --wait --tested "${tmp_dir}/stabilize"; then + log 1 'stabilize' "$(wc -l < "${tmp_dir}/stabilize")" else - log 0 'copy-to-build-support' 0 + log 0 'stabilize' 0 + fi +fi + +if [ -s "${tmp_dir}/unblock" ]; then + if run_and_log_on_error 'unblock' "${base_dir}/bin/modify-package-state" --wait --unblock "${tmp_dir}/unblock"; then + log 1 'unblock' "$(wc -l < "${tmp_dir}/unblock")" + else + log 0 'unblock' 0 fi fi -- cgit v1.2.3