From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Wed, 6 Dec 2023 03:07:54 +0000 (+1300)
Subject: python:tests: Permit newer copyright notice
X-Git-Tag: talloc-2.4.2~425
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=261d3ade8ddae1ecbc49bfe839ad9ffbdbc104f1;p=thirdparty%2Fsamba.git

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>
---

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)