mg-adjust-flight-makexrefs: Use ^ for excluding jobs, not !

The ! here doesn't cause shell rune trouble in practice very much, but
we want to move to using ^ everywhere for consistency.

We still honour !.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/cr-daily-branch b/cr-daily-branch
index 14e8595e2de5f82ba7c3892769aa080d942c7eae..a06d5a49ed7bb37d176f32114f032c09f19a72b7 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -343,7 +343,7 @@ xen-unstable-smoke)
        : ${SMOKE_HARNESS_REV:=$harness_rev}
 
        ./mg-adjust-flight-makexrefs -v $flight \
-               '!build-*-xsm !build-*-libvirt build-*-*' \
+               '^build-*-xsm ^build-*-libvirt build-*-*' \
                --debug --blessings=real                                \
                --branch=xen-unstable,xen-unstable-smoke,osstest        \
                --revision-osstest=$SMOKE_HARNESS_REV

diff --git a/mg-adjust-flight-makexrefs b/mg-adjust-flight-makexrefs
index 3e02ef30a0cec514eecdc0637cd3b3711359506b..16a0d988c56e80a56e4651f27f52a92152d871b6 100755 (executable)
--- a/mg-adjust-flight-makexrefs
+++ b/mg-adjust-flight-makexrefs
@@ -1,15 +1,16 @@
 #!/bin/bash
 #
 # usage: ./mg-adjust-flight-makexrefs [OPTIONS..] FLIGHT       \
-#              '[!]JOB-GLOB ...'                               \
+#              '[^]JOB-GLOB ...'                               \
 #              REF-CONDS...
 #
 # JOB-GLOB is as for shell `case'.  Sense of first match is used.
 # If no match for a job, uses reverse of sense of last glob.
 #
-# ! means keep such jobs in FLIGHT.  Without ! means delete each such
+# ^ means keep such jobs in FLIGHT.  Without ^ means delete each such
 # job from FLIGHT and replace intra-flight references to it with
 # references to the same job in a suitable other flight.
+# (! may be used instead of ^.)
 #
 # `Suitable' means one in which the required job passed, subject to
 # REF-CONDS (which are passed to sg-check-tested).  REF-CONDS really
@@ -59,7 +60,7 @@ for j in `./cs-adjust-flight $flight jobs-list '^build-'`; do
 
        for glob in $keepjobs; do
                case "$glob" in
-               !*) ifmatch=$tokeep; action=$todelete ; glob="${glob#!}" ;;
+               [!^]*) ifmatch=$tokeep; action=$todelete ; glob="${glob#?}" ;;
                *)  ifmatch=$todelete; action=$tokeep ;;
                esac