diff mbox series

[OSSTEST,v2,7/8] mg-repro-setup: actually accept --rebuild -rVAR=VALUE

Message ID 20190621142258.1543-8-ian.jackson@eu.citrix.com (mailing list archive)
State New, archived
Headers show
Series mg-repro-* improvements | expand

Commit Message

Ian Jackson June 21, 2019, 2:22 p.m. UTC 
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
---
 cs-adjust-flight | 2 +-
 mg-repro-setup   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/cs-adjust-flight b/cs-adjust-flight
index 5be5af38..ae342506 100755
--- 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 b55f021e..3ceb7032 100755
--- 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                                 ;;