update util/check-changes to handle non master branched (util/check-changes master...

diff --git a/CHANGES b/CHANGES
index 09de4f7fcc5b9981241481fbf72df2a081e719a0..352d9b663071081d86ad8ee402650adc38f4c1b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4910.  [func]          Update util/check-changes to work on release branches.
+                       [GL #113]
+
 4909.  [bug]           named-checkconf did not detect in-view zone collisions.
                        [GL #125]
 

diff --git a/util/check-changes b/util/check-changes
index 705cf1c835a9fcd259eb51b9f5419b9e5a8100d4..4342c221619aaed3bae78e31e03703250a2d28e1 100644 (file)
--- a/util/check-changes
+++ b/util/check-changes
@@ -9,13 +9,13 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
     if $running_under_some_shell;
                        # this emulates #! processing on NIH machines.
                        # (remove #! line above if indigestible)
 
+$master = 1;
+
 eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_0-9]+=)(.*)/ && shift;
                        # process any FOO=bar switches
 
@@ -26,9 +26,15 @@ $change = 0;
 $status = 0;
 
 line: while (<>) {
-    ($Fld1,$Fld2) = split(' ', $_, 9999);
+    ($Fld1,$Fld2,$Fld3,$Fld4) = split(' ', $_, 9999);
+    $change = 0 if (!$master && $Fld1 eq "---" &&
+                   $Fld3 eq "released" && $Fld4 eq "---");
     if ($Fld1 =~ /^[1-9][0-9]*\.$/ && $Fld2 =~ /^\[.*\]$/) {
-       if ($change != 0 && $Fld1 + 1 != $change) {
+       if ($change != 0 && $Fld1 >= $change) {
+           print 'bad change number', $Fld1;
+           $status = 1;
+       }
+       if ($master && $change != 0 && $Fld1 + 1 != $change) {
            print 'bad change number', $Fld1;
            $status = 1;
        }