diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-06-22 18:57:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-22 18:57:29 +0000 |
| commit | 52613a9ca6a00be9137f5453da3ecbf845fb4bc7 (patch) | |
| tree | 627f999a60719b977f31254448dd9b342450dbc9 | |
| parent | 5bc98c060ddc56fdbbe1691eed7fa8c5a61316e1 (diff) | |
| parent | e2a519ed6fdb51fd790cad792e72302e4ea2bccf (diff) | |
| download | repohooks-52613a9ca6a00be9137f5453da3ecbf845fb4bc7.tar.gz | |
Merge "hooks: gofmt: fix argument handling" am: e2a519ed6fandroid14-dev
Original change: https://android-review.googlesource.com/c/platform/tools/repohooks/+/2621058
Change-Id: I31c85fa5481a304bd4554405e934ddaaba0692b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | rh/hooks.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rh/hooks.py b/rh/hooks.py index e5ca8eb..457a440 100644 --- a/rh/hooks.py +++ b/rh/hooks.py @@ -858,13 +858,14 @@ def check_gofmt(project, commit, _desc, diff, options=None): return None gofmt = options.tool_path('gofmt') - cmd = [gofmt, '-l'] + options.args((), filtered) + cmd = [gofmt, '-l'] + options.args() + fixup_cmd = [gofmt, '-w'] + options.args() + ret = [] for d in filtered: data = rh.git.get_file_content(commit, d.file) result = _run(cmd, input=data) if result.stdout: - fixup_cmd = [gofmt, '-w'] ret.append(rh.results.HookResult( 'gofmt', project, commit, error=result.stdout, files=(d.file,), fixup_cmd=fixup_cmd)) |