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

(cherry picked from commit 88a2202093c2b5712f3d1b5b7edc7223b8a02e9a)

diff --git a/CHANGES b/CHANGES
index cb54d9b1321d9b115579f26dcb4f5f9c1d7941db..e5a8d73fa997856ab3eeb3af6cd712918777c075 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 3a26847db4ae2366c6c396c9481e4f0354f90230..e440d72eea4eeb48217458716cf86455336d37af 100644 (file)
--- a/util/check-changes
+++ b/util/check-changes
@@ -6,13 +6,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $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
 
@@ -23,9 +23,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;
        }