>From 622cef78a7dcbd27c426f09848d0abfbb53df843 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 31 Jul 2022 18:44:56 +0200 Subject: [PATCH 05/16] gnulib-tool.py: Emit error message when conflicting modes are specified. * gnulib-tool.py (main): Fix test of conflicting modes. (Some options produce a value of [], and as a condition, [] evaluates to False.) --- ChangeLog | 4 ++++ gnulib-tool.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14db3cc7e8..3c271bd4de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2022-07-31 Bruno Haible + gnulib-tool.py: Emit error message when conflicting modes are specified. + * gnulib-tool.py (main): Fix test of conflicting modes. (Some options + produce a value of [], and as a condition, [] evaluates to False.) + gnulib-tool.py: Remove most short options. * gnulib-tool.py (main): Reorder the list of options. Remove most short options, for consistency with gnulib-tool. diff --git a/gnulib-tool.py b/gnulib-tool.py index c7ab100d78..b16becb1d2 100755 --- a/gnulib-tool.py +++ b/gnulib-tool.py @@ -351,7 +351,6 @@ def main(): cmdargs.mode_create_megatestdir, cmdargs.mode_test, cmdargs.mode_megatest, - cmdargs.mode_copy_file, cmdargs.mode_xdescription, cmdargs.mode_xcomment, cmdargs.mode_xstatus, @@ -365,8 +364,9 @@ def main(): cmdargs.mode_xlink, cmdargs.mode_xlicense, cmdargs.mode_xmaintainer, + cmdargs.mode_copy_file, ] - overflow = [arg for arg in args if arg] + overflow = [arg for arg in args if arg != None] if len(overflow) > 1: message = 'gnulib-tool: Unable to combine different modes of work.\n' message += 'Try \'gnulib-tool --help\' for more information.\n' -- 2.34.1