Commit 88a22020 authored by Mark Andrews's avatar Mark Andrews
Browse files

update util/check-changes to handle non master branched (util/check-changes master=0 CHANGES)

parent 93267b82
Pipeline #591 passed with stages
in 16 minutes and 53 seconds
4910. [func] Update util/check-changes to work on release branches.
[GL #113]
4909. [bug] named-checkconf did not detect in-view zone collisions. 4909. [bug] named-checkconf did not detect in-view zone collisions.
[GL #125] [GL #125]
   
......
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
# $Id$
eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
if $running_under_some_shell; if $running_under_some_shell;
# this emulates #! processing on NIH machines. # this emulates #! processing on NIH machines.
# (remove #! line above if indigestible) # (remove #! line above if indigestible)
$master = 1;
eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_0-9]+=)(.*)/ && shift; eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_0-9]+=)(.*)/ && shift;
# process any FOO=bar switches # process any FOO=bar switches
...@@ -26,9 +26,15 @@ $change = 0; ...@@ -26,9 +26,15 @@ $change = 0;
$status = 0; $status = 0;
line: while (<>) { 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 ($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; print 'bad change number', $Fld1;
$status = 1; $status = 1;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment