From 8b34eb4d1e76ae1a94ffce09dbc2a1fbc75d551c Mon Sep 17 00:00:00 2001 From: Robert Iannucci Date: Wed, 11 Dec 2019 23:15:47 +0000 Subject: [PATCH] [goma_ctl] Use vpython to call goma_ctl.py. goma_ctl.py recommends that folks run `pip install pywin32`, which will work up until python in depot_tools is updated, at which point it will break again. Running with vpython means that the vpython spec which ships with goma will correctly take effect. R=brucedawson@chromium.org, tikuta@chromium.org Bug: 1033106 Change-Id: Icafadf381df782ab30d6cc156419dd7ed424d2bf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1962721 Auto-Submit: Robbie Iannucci Reviewed-by: Andrii Shyshkalov Reviewed-by: Takuto Ikuta Commit-Queue: Takuto Ikuta --- goma_ctl | 2 +- goma_ctl.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goma_ctl b/goma_ctl index ac2728389..4e562424e 100755 --- a/goma_ctl +++ b/goma_ctl @@ -9,4 +9,4 @@ MYPATH=$(dirname "${BASH_SOURCE[0]}") source "$MYPATH/cipd_bin_setup.sh" cipd_bin_setup &> /dev/null -PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_ctl.py" "$@" +PYTHONDONTWRITEBYTECODE=1 exec vpython "$MYPATH/.cipd_bin/goma_ctl.py" "$@" diff --git a/goma_ctl.bat b/goma_ctl.bat index ec706b754..e6900aaac 100644 --- a/goma_ctl.bat +++ b/goma_ctl.bat @@ -4,5 +4,5 @@ :: found in the LICENSE file. @call "%~dp0\cipd_bin_setup.bat" > null 2>&1 -@call python.bat %~dp0\.cipd_bin\goma_ctl.py %* +@call vpython.bat %~dp0\.cipd_bin\goma_ctl.py %* exit /b