upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-04 17:12:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'ondrej/make-merge_copyrights-ignore-hidden-files' into 'master'

Browse source 
Make merge_copyrights ignore hidden files

See merge request isc-projects/bind9!3417
This commit is contained in:
Ondřej Surý 2020-04-23 05:58:36 +00:00
commit 7a0ebb14f3
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
util/copyrights
View file

@ -1,6 +1,3 @@
./.gitlab-ci.yml X 2018,2019,2020
./.pylintrc X 2020
./.uncrustify.cfg X 2018,2019,2020
./AUTHORS X 2020
./CHANGES X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
./COPYING X 2020
@ -399,7 +396,6 @@
./bin/tests/system/dnssec/ns2/sign.sh SH 2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018,2019,2020
./bin/tests/system/dnssec/ns3/sign.sh SH 2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
./bin/tests/system/dnssec/ns3/unsupported-algorithm.key X 2018,2019,2020
./bin/tests/system/dnssec/ns5/.gitignore X 2015,2018,2019
./bin/tests/system/dnssec/ns5/sign.sh SH 2015,2016,2017,2018,2019,2020
./bin/tests/system/dnssec/ns6/named.args X 2013,2014,2016,2018,2019,2020
./bin/tests/system/dnssec/ns6/sign.sh SH 2013,2014,2016,2017,2018,2019,2020

10
util/merge_copyrights
View file

@ -30,13 +30,8 @@ $year += 1900;
open(CHANGES, "git ls-files | sed 's;^;./;' | sort |") || die "git ls-files: $!";
while (<CHANGES>) {
chomp;
next if (m%/\.\# | # CVS old conflict file
/CVS/ | # CVS directory
/\.git/ | # git directory
/\.gitignore | # .gitignore files
/\.gitattributes | # .gitattributes files
/\.clang-format | # .clang-format files
next if (m%/\. | # just ignore all hidden files
/ChangeLog | #
Makefile.(am|in) | # build system doesn't need to have copyright
/m4/ | # build system doesn't need to have copyright
@ -59,7 +54,6 @@ while (<CHANGES>) {
/cocci/.* | # coccinelle spatch files
\.conf$ | # configuration files
\.conf\.in$ | # configuration files
\.dir-locals\.el | # emacs local variables
/(dnssafe|openssl)/.*\.[ch]$ | # imported
doc/(draft|expired|rfc)/ | # imported
\.txt$ # text files don't really need copyright