summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-08-22 23:56:10 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2020-08-27 00:44:33 +0900
commitea6cedc5b8a4e666da41f1173ea19970fa60683f (patch)
tree9ebf8342cb3cb2777c42f59b99210d9afb80147b
parent8a685db32f2b3495c91efab6e9462c2fd934778f (diff)
downloadlinux-riscv-ea6cedc5b8a4e666da41f1173ea19970fa60683f.tar.gz
linux-riscv-ea6cedc5b8a4e666da41f1173ea19970fa60683f.tar.bz2
linux-riscv-ea6cedc5b8a4e666da41f1173ea19970fa60683f.zip
gen_compile_commands: use choices for --log_levels option
Use 'choices' to check if the given parameter is valid. I also simplified the help message because, with 'choices', --help shows the list of valid parameters: --log_level {DEBUG,INFO,WARNING,ERROR,CRITICAL} I started the help message with a lower case, "the level of log ..." in order to be consistent with the -h option: -h, --help show this help message and exit The message "show this help ..." comes from the ArgumentParser library code, and I do not know how to change it. So, I changed our code. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
-rwxr-xr-xscripts/gen_compile_commands.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/scripts/gen_compile_commands.py b/scripts/gen_compile_commands.py
index 1bcf33a93cb9..535248cf2d7e 100755
--- a/scripts/gen_compile_commands.py
+++ b/scripts/gen_compile_commands.py
@@ -45,24 +45,18 @@ def parse_arguments():
'compile_commands.json in the search directory)')
parser.add_argument('-o', '--output', type=str, help=output_help)
- log_level_help = ('The level of log messages to produce (one of ' +
- ', '.join(_VALID_LOG_LEVELS) + '; defaults to ' +
+ log_level_help = ('the level of log messages to produce (defaults to ' +
_DEFAULT_LOG_LEVEL + ')')
- parser.add_argument(
- '--log_level', type=str, default=_DEFAULT_LOG_LEVEL,
- help=log_level_help)
+ parser.add_argument('--log_level', choices=_VALID_LOG_LEVELS,
+ default=_DEFAULT_LOG_LEVEL, help=log_level_help)
args = parser.parse_args()
- log_level = args.log_level
- if log_level not in _VALID_LOG_LEVELS:
- raise ValueError('%s is not a valid log level' % log_level)
-
directory = args.directory or os.getcwd()
output = args.output or os.path.join(directory, _DEFAULT_OUTPUT)
directory = os.path.abspath(directory)
- return log_level, directory, output
+ return args.log_level, directory, output
def process_line(root_directory, file_directory, command_prefix, relative_path):