diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2023-12-06 16:07:54 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2023-12-08 02:28:33 +0000 |
| commit | 261d3ade8ddae1ecbc49bfe839ad9ffbdbc104f1 (patch) | |
| tree | 9763129e3481326bbc77b430dbadf433f0231d2b /python | |
| parent | 763b2efe69dc74e1c0cd954607031012f832486d (diff) | |
| download | samba-261d3ade8ddae1ecbc49bfe839ad9ffbdbc104f1.tar.gz samba-261d3ade8ddae1ecbc49bfe839ad9ffbdbc104f1.tar.bz2 samba-261d3ade8ddae1ecbc49bfe839ad9ffbdbc104f1.zip | |
python:tests: Permit newer copyright notice
We can use an HTTPS URL (https://www.gnu.org/licenses/) now.
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/source.py | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/python/samba/tests/source.py b/python/samba/tests/source.py index 1c3c2ce2a7e..c3ff8e0fc0b 100644 --- a/python/samba/tests/source.py +++ b/python/samba/tests/source.py @@ -114,7 +114,8 @@ class TestSource(TestCase): """Test that all .py files have a GPL disclaimer.""" incorrect = [] - gpl_txt = """ + gpl_txts = [ + """ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or @@ -127,8 +128,24 @@ class TestSource(TestCase): # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +""", """ - gpl_re = re.compile(re.escape(gpl_txt), re.MULTILINE) +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. +""", + ] + gpl_re = f'(?:{"|".join(map(re.escape, gpl_txts))})' + gpl_re = re.compile(gpl_re, re.MULTILINE) for fname, text in get_source_file_contents(): if "wafsamba" in fname: @@ -149,7 +166,7 @@ class TestSource(TestCase): if incorrect: help_text = ['Some files have missing or incomplete GPL statement', - gpl_txt] + gpl_txts[-1]] for fname in incorrect: help_text.append((' ' * 4) + fname) |
