mg-repro-setup: actually accept --rebuild -rVAR=VALUE

The glob syntax here was wrong, and the code cs-adjust-flight did not
handle it properly either.  So --rebuild -r has not worked since it
first appeared in:
   a1e0e5846f7bb7d82a5db1d7cd643b9f5ca1b9a9
   mg-repro-flight: Provide --rebuild to make variant build jobs

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New patch

diff --git a/cs-adjust-flight b/cs-adjust-flight
index 5be5af38de4854013bbf5f165f672986134c8b67..ae342506dbd143eeb053fb3a7dbcae1f9933e60b 100755 (executable)
--- a/cs-adjust-flight
+++ b/cs-adjust-flight
@@ -485,7 +485,7 @@ sub change__repro_buildjobs {
     my @refspecs;
     my @varspecs;
     my %treespecs;
-    while (@changes && $changes[0] =~ m/^[.=+]/) {
+    while (@changes && $changes[0] =~ m/^[.=+]|^-r/) {
        local $_ = shift @changes;
        if (m/^[.=]/) {
            push @refspecs, $_;

diff --git a/mg-repro-setup b/mg-repro-setup
index b55f021e4011b873cafa56fc68db87509f79b378..3ceb703284d367657b2011cb5d96a5e8b5d030e5 100755 (executable)
--- a/mg-repro-setup
+++ b/mg-repro-setup
@@ -187,7 +187,7 @@ while [ $# -ne 0 ]; do
                rebuild_specs=()
                while true; do
                        case "$1" in
-                       [.=+]*|-r) rebuild_specs+=("$1");       shift ;;
+                       [.=+]*|-r*) rebuild_specs+=("$1");      shift ;;
                        -B?*)   rebuilds_blessing=${1#-B};      shift ;;
                        -*)     badusage ': bad --rebuild option'     ;;
                         *)      break                                 ;;