From: Collin Funk Date: Wed, 8 May 2024 00:10:23 +0000 (-0700) Subject: gnulib-tool.py: Handle module dependencies that cannot be found. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=e91650b1de1487db96b573df65757e9bb5bfbedd;p=gnulib.git gnulib-tool.py: Handle module dependencies that cannot be found. * pygnulib/GLModuleSystem.py (GLModule.getDependenciesWithoutConditions): Filter out None from the module dependencies. An appropriate warning will already be printed by GLModuleSystem.find(). --- diff --git a/ChangeLog b/ChangeLog index 21f4039dfe..b752fde065 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-05-07 Collin Funk + + gnulib-tool.py: Handle module dependencies that cannot be found. + * pygnulib/GLModuleSystem.py + (GLModule.getDependenciesWithoutConditions): Filter out None from the + module dependencies. An appropriate warning will already be printed by + GLModuleSystem.find(). + 2024-05-07 Paul Eggert nstrftime: use clearer code for padding diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index 2cb5d1d468..b25779d62e 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -504,7 +504,7 @@ class GLModule: self.cache['dependencies'] = result return self.cache['dependencies'] - def getDependenciesWithoutConditions(self) -> list[GLModule | None]: + def getDependenciesWithoutConditions(self) -> list[GLModule]: '''Return list of dependencies, as a list of GLModule objects. GLConfig: localpath.''' if 'dependenciesWithoutCond' not in self.cache: @@ -518,6 +518,9 @@ class GLModule: result = [ self.modulesystem.find(module) for module in lines if module != '' ] + result = [ module + for module in result + if module is not None ] self.cache['dependenciesWithoutCond'] = result return self.cache['dependenciesWithoutCond']