summaryrefslogtreecommitdiff
path: root/bin/build-packages
diff options
context:
space:
mode:
Diffstat (limited to 'bin/build-packages')
-rwxr-xr-xbin/build-packages21
1 files changed, 12 insertions, 9 deletions
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}"