From: Bruno Haible Date: Fri, 12 Apr 2024 22:53:05 +0000 (+0200) Subject: gnulib-tool.py: Implement --add-import --avoid correctly. X-Git-Tag: v1.0~106 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b7faa612cf7b8e035699c8e7e38dab0bab41c007;p=gnulib.git gnulib-tool.py: Implement --add-import --avoid correctly. * pygnulib/GLConfig.py (GLConfig.update): Don't test for the unused key 'tests'. (GLConfig.default): Likewise. * pygnulib/GLImport.py (GLImport.__init__): Don't merge back those values which were already considered by taking the union. --- diff --git a/ChangeLog b/ChangeLog index 8a8451ef2e..db3c4591e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ gnulib-tool.py: Implement --add-import --avoid correctly. * pygnulib/GLConfig.py (GLConfig.update): Don't test for the unused key 'tests'. + (GLConfig.default): Likewise. * pygnulib/GLImport.py (GLImport.__init__): Don't merge back those values which were already considered by taking the union. diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py index c9248453aa..4e1eeb1375 100644 --- a/pygnulib/GLConfig.py +++ b/pygnulib/GLConfig.py @@ -321,7 +321,7 @@ class GLConfig: return 2.64 elif key == 'verbosity': return 0 - elif key in ['localpath', 'modules', 'avoids', 'tests', + elif key in ['localpath', 'modules', 'avoids', 'incl_test_categories', 'excl_test_categories']: return [] elif key in ['incobsolete', 'gnu_make',