Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
ca99202a
Commit
ca99202a
authored
Mar 08, 2018
by
Mark Andrews
Browse files
update util/check-changes to handle non master branched (util/check-changes master=0 CHANGES)
(cherry picked from commit
88a22020
)
parent
35c5c596
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
ca99202a
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]
...
...
util/check-changes
View file @
ca99202a
...
...
@@ -15,13 +15,13 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $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
...
...
@@ -32,9 +32,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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment