Simon Josefsson wrote:
> OATH Toolkit fails with sh+py though...  isn't the --local-dir part
> working?  It doesn't notice the patches in liboath/gl/override.

Indeed. It reads the gl_LOCAL_DIR value from gnulib-cache.m4 but
then overwrites it with []. This patch fixes it.


2024-03-15  Bruno Haible  <br...@clisp.org>

        gnulib-tool.py: Don't lose the gl_LOCAL_DIR value from gnulib-cache.m4.
        Reported by Simon Josefsson in
        <https://lists.gnu.org/archive/html/bug-gnulib/2024-03/msg00152.html>.
        * pygnulib/GLConfig.py (GLConfig.default): For the 'localpath' property,
        return [], not ''.

diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py
index fea65803d9..ce34de8aec 100644
--- a/pygnulib/GLConfig.py
+++ b/pygnulib/GLConfig.py
@@ -282,7 +282,8 @@ class GLConfig(object):
                 return 2.64
             elif key == 'verbosity':
                 return 0
-            elif key in ['modules', 'avoids', 'tests', 'incl_test_categories', 
'excl_test_categories']:
+            elif key in ['localpath', 'modules', 'avoids', 'tests',
+                         'incl_test_categories', 'excl_test_categories']:
                 return list()
             elif key in ['libtool', 'lgpl', 'gnu_make', 'automake_subdir', 
'conddeps', 'symbolic',
                          'lsymbolic', 'libtests', 'dryrun']:




Reply via email to