pre-upload: fix a few style/compatibility issues
A few review notes came after CL:1336039 landed.
* os.path.join: might as well use this everywhere we're constructing
paths out of _get_hooks_dir()
* it's a little clearer to name the non-msg HookFailure() args
BUG=none
TEST=unit tests; run a few good/bad commits through .../pre-upload.py
Change-Id: I401fe6c8bf02a3020122fa0875b2beb23345be27
Reviewed-on: https://chromium-review.googlesource.com/1372334
Commit-Ready: Brian Norris <briannorris@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/pre-upload.py b/pre-upload.py
index ef17c32..14c5e99 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -1254,7 +1254,7 @@
options.append('--commit=HEAD')
else:
options.extend(['--commit', commit])
- cmd = ['%s/clang-format.py' % hooks_dir] + options
+ cmd = [os.path.join(hooks_dir, 'clang-format.py')] + options
cmd_result = cros_build_lib.RunCommand(cmd=cmd,
print_cmd=False,
input=_get_patch(commit),
@@ -1282,7 +1282,7 @@
# Upstream does not want those lines (since they do not use Gerrit), but
# we always do, so disable the check globally.
options.append('--ignore=GERRIT_CHANGE_ID')
- cmd = ['%s/checkpatch.pl' % hooks_dir] + options + ['-']
+ cmd = [os.path.join(hooks_dir, 'checkpatch.pl')] + options + ['-']
cmd_result = cros_build_lib.RunCommand(cmd=cmd,
print_cmd=False,
input=_get_patch(commit),
@@ -1300,10 +1300,11 @@
included, excluded)
if files:
hooks_dir = _get_hooks_dir()
- cmd = ['%s/kernel-doc' % hooks_dir, '-none'] + files
+ cmd = [os.path.join(hooks_dir, 'kernel-doc'), '-none'] + files
output = _run_command(cmd=cmd, combine_stdout_stderr=True)
if output:
- return HookFailure('kernel-doc errors/warnings:', output.splitlines())
+ return HookFailure('kernel-doc errors/warnings:',
+ items=output.splitlines())
def _kernel_configcheck(_project, commit):
