From 3d99a44c67c1a7db5bfe210f46ede1eb0700e664 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Mon, 26 Feb 2024 21:22:23 -0800 Subject: [PATCH 1/2] gnulib-tool.py: Follow gnulib-tool changes, part 29. Follow gnulib-tool change 2021-03-06 Paul Eggert parse-datetime2: fix licensing * pygnulib/GLModuleSystem.py (GLModule.getLicense): Handle the special licensing case for parse-datetime2 or any other module starting with "parse-datetime". Update comment. --- ChangeLog | 10 ++++++++++ gnulib-tool.py.TODO | 14 -------------- pygnulib/GLModuleSystem.py | 4 ++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d399841e18..7692ac13bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2024-02-26 Collin Funk + + gnulib-tool.py: Follow gnulib-tool changes, part 29. + Follow gnulib-tool change + 2021-03-06 Paul Eggert + parse-datetime2: fix licensing + * pygnulib/GLModuleSystem.py (GLModule.getLicense): Handle the special + licensing case for parse-datetime2 or any other module starting with + "parse-datetime". Update comment. + 2024-02-26 Bruno Haible gnulib-tool.py: Add more comments. diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index c72746941e..7be0e243e7 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -605,20 +605,6 @@ Date: Mon Apr 26 23:31:29 2021 -0700 -------------------------------------------------------------------------------- -commit 487b9551b63ef936a6be6df38d1c9484cd97810c -Author: Paul Eggert -Date: Sat Mar 6 08:23:48 2021 -0800 - - parse-datetime2: fix licensing - - Problem reported by Bruno Haible in: - https://lists.gnu.org/r/bug-gnulib/2021-03/msg00017.html - * gnulib-tool (func_get_license): Treat parse-datetime2 - (actually, anything starting with "parse-datetime") - like parse-datetime, as far as licenses go. - --------------------------------------------------------------------------------- - commit 0be855ee827bf7e9043eeb626c4fd847704be2e6 Author: Bruno Haible Date: Tue Dec 29 02:48:31 2020 +0100 diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index c6f0eb15c7..787614d38c 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -665,8 +665,8 @@ class GLModule(object): raise GLError(18, str(self)) else: # if not self.config['errors'] sys.stderr.write('gnulib-tool: warning: module %s lacks a License\n' % str(self)) - if str(self) == 'parse-datetime': - # This module is under a weaker license only for the purpose of some + if str(self).startswith('parse-datetime'): + # These modules are under a weaker license only for the purpose of some # users who hand-edit it and don't use gnulib-tool. For the regular # gnulib users they are under a stricter license. result = 'GPL' -- 2.39.2