From: Bruno Haible Date: Tue, 15 Apr 2025 20:21:04 +0000 (+0200) Subject: gnulib-tool.py: Fix exception during --update with changed macro-prefix. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=150b990b84fd593b3e7dea16690f8f916f6d5f13;p=gnulib.git gnulib-tool.py: Fix exception during --update with changed macro-prefix. * pygnulib/GLImport.py (GLImport.__init__): Support the case that the expected ${macro_prefix}_FILE_LIST definition was not found. --- diff --git a/ChangeLog b/ChangeLog index 081d60bbc8..03a8c70902 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2025-04-15 Bruno Haible + + gnulib-tool.py: Fix exception during --update with changed macro-prefix. + * pygnulib/GLImport.py (GLImport.__init__): Support the case that the + expected ${macro_prefix}_FILE_LIST definition was not found. + 2025-04-15 Bruno Haible trim tests: Avoid test failures on macOS 15.4. diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index da4f184a88..3d454a0938 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2024 Free Software Foundation, Inc. +# Copyright (C) 2002-2025 Free Software Foundation, Inc. # # 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 @@ -228,7 +228,12 @@ class GLImport: data = file.read() regex = r'AC_DEFUN\(\[%s_FILE_LIST\], \[(.*?)\]\)' % self.cache['macro_prefix'] pattern = re.compile(regex, re.S | re.M) - self.cache.setFiles(pattern.findall(data)[-1].strip().split()) + matches = pattern.findall(data) + if matches: + files = matches[-1].strip().split() + else: + files = [] + self.cache.setFiles(files) # The self.config['localpath'] defaults to the cached one. Recall that # the cached one is relative to self.config['destdir'], whereas the one