From 242b6016c6aa3b6750d6ada793e0dd37fb782d8f Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Fri, 23 Feb 2024 21:12:39 -0800 Subject: [PATCH] gnulib-tool.py: Fix conditional checking the incorrect variable. Reported by Bruno Haible in . * gnulib-tool.py (main): Fix incorrect conditional. Check that mode, not modules, is not None before treating it as a string. --- ChangeLog | 8 ++++++++ gnulib-tool.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f7cbd64874..282265ba8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-02-24 Collin Funk + + gnulib-tool.py: Fix conditional checking the incorrect variable. + Reported by Bruno Haible in + . + * gnulib-tool.py (main): Fix incorrect conditional. Check that mode, not + modules, is not None before treating it as a string. + 2024-02-24 Bruno Haible striconveha tests: Avoid test failure on macOS 12.5. diff --git a/gnulib-tool.py b/gnulib-tool.py index 599dbe0984..e168e8fc91 100755 --- a/gnulib-tool.py +++ b/gnulib-tool.py @@ -607,7 +607,7 @@ def main(): if cmdargs.pobase == None and cmdargs.podomain != None: message = '%s: warning: --po-domain has no effect without a --po-base option\n' % constants.APP['name'] sys.stderr.write(message) - if modules != None and "tests" in mode and gnu_make: + if mode != None and "tests" in mode and gnu_make: message = '%s: --gnu-make not supported when including tests\n' % constants.APP['name'] sys.stderr.write(message) sys.exit(1) -- 2.39.5