summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-06-20 10:40:06 +0200
committerErich Eckner <git@eckner.net>2019-06-20 10:40:06 +0200
commit5733176e77d91b6302acac5c718b1f678d2797d9 (patch)
tree9962163acbb9f83f9c761938d674cf05124521a9
parentae247cfa1d9ae8cea8f7fb5b599d4a56241ab77e (diff)
downloadbuilder-5733176e77d91b6302acac5c718b1f678d2797d9.tar.xz
straws mirrored_source and mirrored_source_by_hash should be only active in the first build trial (ae247cfa1d9ae8cea8f7fb5b599d4a56241ab77e changed the logic of those)
-rwxr-xr-xconf/slave.conf.example4
-rwxr-xr-xlib/load-configuration4
2 files changed, 2 insertions, 6 deletions
diff --git a/conf/slave.conf.example b/conf/slave.conf.example
index 52a7a3f..2e02867 100755
--- a/conf/slave.conf.example
+++ b/conf/slave.conf.example
@@ -24,10 +24,8 @@
# what should be tried in what order to somehow repair a broken build
#straws_that_might_repair_failing_builds=$(
# printf '%s\n' \
-# ':' \
+# ':mirrored_source:mirrored_source_by_hash:' \
# ':clean_chroot:' \
-# ':mirrored_source_by_hash:' \
-# ':mirrored_source:' \
# ':with_build_support:' \
# ':with_build_support:clean_chroot:'
#)
diff --git a/lib/load-configuration b/lib/load-configuration
index 4b72de3..7fd627d 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -81,10 +81,8 @@ source_by_hash_mirror='https://sources.archlinux32.org/'
# what should be tried in what order to somehow repair a broken build
straws_that_might_repair_failing_builds=$(
printf '%s\n' \
- ':' \
+ ':mirrored_source:mirrored_source_by_hash:' \
':clean_chroot:' \
- ':mirrored_source_by_hash:' \
- ':mirrored_source:' \
':with_build_support:' \
':with_build_support:clean_chroot:'
)