[OSSTEST PATCH 3/4] mg-adjust-flight-makexrefs: Use ^ for excluding jobs, not !

[Ian Jackson <ian.jackson@eu.citrix.com>]

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>
---
 cr-daily-branch            | 2 +-
 mg-adjust-flight-makexrefs | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cr-daily-branch b/cr-daily-branch
index 14e8595..a06d5a4 100755
--- 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 3e02ef3..16a0d98 100755
--- 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
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel