From 43d002a2caf281a65ee2b92dc73e97219aac382e Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Tue, 31 Mar 2020 23:45:17 +0000 Subject: [PATCH] Revert "git-cl: Execute clang-format-diff.py using vpython." This reverts commit beec66070ea79d5cad14d27927ef1bb2f0f01793. Reason for revert: OSError: Execution failed with error: [Errno 2] No such file or directory: 'vpython'. Original change's description: > git-cl: Execute clang-format-diff.py using vpython. > > When running git-cl using vpython3, sys.executable is python3. > Execute clang-format-diff.py using vpython instead, since it has > not been migrated already. > > Bug: 1066187 > Change-Id: I31556acb50ff4256706a313c1393eddad9f903f3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2130926 > Reviewed-by: Josip Sokcevic > Commit-Queue: Edward Lesmes TBR=ehmaldonado@chromium.org,apolito@google.com,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,sokcevic@google.com Change-Id: I555251d8dbb1582d7f03702b7910d70a11b75855 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1066187 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2130785 Reviewed-by: Edward Lesmes Commit-Queue: Edward Lesmes --- git_cl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_cl.py b/git_cl.py index fb5f32054..30800918d 100755 --- a/git_cl.py +++ b/git_cl.py @@ -4758,7 +4758,7 @@ def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit): except clang_format.NotFoundError as e: DieWithError(e) - cmd = ['vpython', script, '-p0'] + cmd = [sys.executable, script, '-p0'] if not opts.dry_run and not opts.diff: cmd.append('-i')