From d7b4746ce14b0b448d56acfe51a3be8719113b3e Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 24 Jun 2019 15:35:22 +0200
Subject: bin/build-packages: :haskell_without_check: should not skip if it's
 not a haskell-* package - it should rather append a build trial including
 straw :without_check: if it is such a package

---
 bin/build-packages | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'bin/build-packages')

diff --git a/bin/build-packages b/bin/build-packages
index 0428488..185bada 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -404,21 +404,24 @@ while [ "${count}" -ne 0 ] && \
         "${base_dir}/bin/ping-to-master" "$$" "${tmp_dir}" &
       fi
       success=false
+
+      if printf '%s\n' "${package}" | \
+        grep -q '^\(haskell\|python2\?\)-'; then
+        straws_that_might_repair_failing_builds=$(
+          # shellcheck disable=SC2086
+          printf '%s\n' ${straws_that_might_repair_failing_builds} | \
+            sed '
+              s/^\(.*\):haskell_without_check:\(.*\)$/\1:\2\n\1:without_check:\2/
+            '
+        )
+      fi
+
       for straw in ${straws_that_might_repair_failing_builds}; do
 
         if ${success}; then
           break
         fi
 
-        if echo "${straw}" | \
-          grep -qF ':haskell_without_check:'; then
-          if ! printf '%s\n' "${package}" | \
-            grep -q '^\(haskell\|python2\?\)-'; then
-            continue
-          fi
-          straw="${straw}:without_check:"
-        fi
-
         echo 'preparing' > "${tmp_dir}/.ping-build-master"
 
         outerParameters="-r ${archbuild_chroots}"
-- 
cgit v1.2.3-54-g00ecf