From dd67bbeb3b9b9cd4382eedfca9a2903a699fc683 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 19 Feb 2018 15:20:05 -0500 Subject: [PATCH] qapi: Fix generators to report command line errors decently Report to stderr, prefix with the program name. Also reject extra arguments. Backports commit b45409683e829770000a4560ed21e704f87df74c from qemu --- qemu/scripts/qapi.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qemu/scripts/qapi.py b/qemu/scripts/qapi.py index e215092e..7f59f9f6 100644 --- a/qemu/scripts/qapi.py +++ b/qemu/scripts/qapi.py @@ -988,7 +988,7 @@ def parse_command_line(extra_options = "", extra_long_options = []): "input-file=", "output-dir="] + extra_long_options) except getopt.GetoptError, err: - print str(err) + print >>sys.stderr, "%s: %s" % (sys.argv[0], str(err)) sys.exit(1) output_dir = "" @@ -1016,4 +1016,8 @@ def parse_command_line(extra_options = "", extra_long_options = []): do_c = True do_h = True + if len(args) != 0: + print >>sys.stderr, "%s: too many arguments" % sys.argv[0] + sys.exit(1) + return (input_file, output_dir, do_c, do_h, prefix, extra_opts)