From: Mark Andrews <marka@isc.org>
Date: Tue, 5 Jun 2018 01:49:38 +0000 (+1000)
Subject: call util/check-changes in setup
X-Git-Tag: v9.9.13rc1~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9561c956690bca211f05edc8fd80f3b89a07db7b;p=thirdparty%2Fbind9.git

call util/check-changes in setup

(cherry picked from commit c0e69cc4067cde6671601096dfccdf70fc15d7c4)
(cherry picked from commit 022b2b481fc3015de657f546316c380036d02c06)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91665f65179..c5f5fba01df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,6 +140,7 @@ precheck:debian:sid:amd64:
   <<: *debian_sid_amd64_image
   stage: precheck
   script:
+    - perl util/check-changes CHANGES
     - perl -w util/merge_copyrights
     - diff -urNap util/copyrights util/newcopyrights
     - rm util/newcopyrights
diff --git a/util/check-changes b/util/check-changes
index be506aefefd..51766f97e1c 100644
--- a/util/check-changes
+++ b/util/check-changes
@@ -19,7 +19,7 @@ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
 			# this emulates #! processing on NIH machines.
 			# (remove #! line above if indigestible)
 
-$master = 1;
+$master = 0;
 
 eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_0-9]+=)(.*)/ && shift;
 			# process any FOO=bar switches