From: Bruno Haible Date: Sun, 31 Jul 2022 16:44:56 +0000 (+0200) Subject: gnulib-tool.py: Emit error message when conflicting modes are specified. X-Git-Tag: v1.0~2203 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=07637f9716ea6ca05f0be5b1c03bd53577eea838;p=gnulib.git 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.) --- diff --git a/ChangeLog b/ChangeLog index d4395bcfe0..af97fc0ee6 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'