+2024-03-09 Collin Funk <collin.funk1@gmail.com>
+
+ gnulib-tool.py: Follow gnulib-tool changes, part 49.
+ Follow gnulib-tool change
+ 2021-08-07 Bruno Haible <bruno@clisp.org>
+ gnulib-tool: Add support for Automake 1.16.4.
+ * pygnulib/GLTestDir.py (_patch_test_driver): If patching
+ build-aux/test-driver fails with build-aux/test-driver.diff try again
+ with build-aux/test-driver-1.16.3.diff.
+
2024-03-09 Bruno Haible <bruno@clisp.org>
unistr/u16-to-u32: Relicense under LGPLv2+.
--------------------------------------------------------------------------------
-commit 6ccfbd6495f2849b1aeea84f73327f6ced0080a7
-Author: Bruno Haible <bruno@clisp.org>
-Date: Sun Aug 8 03:52:01 2021 +0200
-
- gnulib-tool: Add support for Automake 1.16.4.
-
- Reported by <shoober420@gmail.com> in
- <https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00000.html>.
-
- * build-aux/test-driver-1.16.3.diff: Renamed from build-aux/test-driver.diff.
- * build-aux/test-driver.diff: Update to match Automake 1.16.4.
- * gnulib-tool (func_create_testdir, func_create_megatestdir): Try both
- .diff files.
-
---------------------------------------------------------------------------------
-
commit 4b071c115309079528db7b60e8d2ffb22b129088
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon Apr 26 23:31:29 2021 -0700
def _patch_test_driver() -> None:
'''Patch the test-driver script in testdirs.'''
test_driver = joinpath('build-aux', 'test-driver')
- diff = joinpath(DIRS['root'], joinpath('build-aux', 'test-driver.diff'))
- command = f'patch {test_driver} < {diff}'
- try:
- result = sp.call(command, shell=True)
- if result != 0:
+ diffs = [ joinpath(DIRS['root'], name)
+ for name in [joinpath('build-aux', 'test-driver.diff'),
+ joinpath('build-aux', 'test-driver-1.16.3.diff')]]
+ patched = False
+ for diff in diffs:
+ command = f'patch {test_driver} < {diff}'
+ try:
+ result = sp.call(command, shell=True)
+ except OSError:
raise GLError(20, None)
- except OSError:
+ if result == 0:
+ patched = True
+ break
+ if not patched:
raise GLError(20, None)