Flight restriction: Update sg-report-flight and sg-report-job-history

Use restrictflight_arg in both these functions.  They still use
$maxflight directly, passing it to report_blessingscond; that will
change in a moment.

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/sg-report-flight b/sg-report-flight
index 018e8e2fb771ff1d37f7271e8225b116e044db2d..bdfbfb65b9fe234122cf35aa505ca065fc1469b8 100755 (executable)
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -65,8 +65,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
         push @includebeginfiles, $1;
     } elsif (m/^--include=(.*)$/) {
         push @includefiles, $1;
-    } elsif (m/^--max-flight=(\d+)$/) {
-        $maxflight= $1;
+    } elsif (restrictflight_arg($_)) {
+        # Handled by Executive
     } elsif (m/^--allow=(.*)$/) {
         my ($allowfile) = $1;
         if (!open A, '<', $allowfile) {

diff --git a/sg-report-job-history b/sg-report-job-history
index 358c9498bb7a36d0cc4e04fe366a4201c1d53c5b..ec2776bf2126cb724474d57c9da4bef1522f4b9f 100755 (executable)
--- a/sg-report-job-history
+++ b/sg-report-job-history
@@ -41,8 +41,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
         $$1= $2;
     } elsif (m/^--(limit)\=([1-9]\d*)$/) {
         $$1= $2;
-    } elsif (m/^--max-flight\=([1-9]\d*)$/) {
-       $maxflight= $1;
+    } elsif (restrictflight_arg($_)) {
+       # Handled by Executive
     } elsif (m/^--html-dir=(.*)$/) {
         $htmlout= $1;
     } elsif (m/^--branches?=(.*)$/) {