bin/build-packages: option -s new to override straws in use

1 files changed, 14 insertions, 1 deletions

diff --git a/bin/build-packages b/bin/build-packages
index d83a2e7..a286ff8 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -40,6 +40,9 @@ usage() {
   >&2 echo '               $count=0 is interpreted as infinity.'
   >&2 echo '               The default is $count=1 or 0 iff -t or -x is given.'
   >&2 echo '               Cannot be combined with -l.'
+  >&2 echo '  -s|--straw $straw:'
+  >&2 echo '               Use this straw instead of the preconfigured ones. -- May be'
+  >&2 echo '               given multiple times to allow using multiple straws.'
   >&2 echo '  -t seconds:  Do not request new assignment(s) $seconds seconds after start.'
   >&2 echo '               Cannot be combined with -l.'
   >&2 echo '  -u|--upload: Upload explicitely built package to build master.'
@@ -50,9 +53,10 @@ usage() {
 }
 
 eval set -- "$(
-  getopt -o hl:n:t:ux \
+  getopt -o hl:n:s:t:ux \
     --long help \
     --long local: \
+    --long straw: \
     --long upload \
     -n "$(basename "$0")" -- "$@" || \
   echo usage
@@ -60,6 +64,7 @@ eval set -- "$(
 
 unset count
 unset forced_package
+unset forced_straws
 exit_after_failure=false
 upload_to_build_master=false
 timeout=0
@@ -84,6 +89,10 @@ do
       [ "${count}" -eq 0 ] && \
         count=-1
     ;;
+    -s|--straw)
+      shift
+      forced_straws="${forced_straws} $1"
+    ;;
     -t)
       shift
       timeout="$1"
@@ -134,6 +143,10 @@ if [ -z "${count}" ]; then
   fi
 fi
 
+if [ -n "${forced_straws}" ]; then
+  straws_that_might_repair_failing_builds="${forced_straws# }"
+fi
+
 if [ "${timeout}" -ne 0 ]; then
   timeout=$((timeout+$(date +%s)))
 fi