InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle goma_ctl/autoninja /?

Browse Source 
With nested batch files it is very common for /? arguments to end up
being interpreted as a request for help on the batch file "call"
command. That is, if a user invokes "goma_ctl /?" then this turns into
something like this:
  @call ...\python3.bat %~dp0\.cipd_bin\goma_ctl.py %*
The name of the script to be invoked is ignored and this is treated
like:
  @call /?

This is particularly problematic for commands like goma_ctl and
autoninja which don't print help if no arguments are passed, thus
making finding the correct help incantation slightly challenging.

This special-cases /? in these two batch files. Some other common batch
files were tested and found to be not affected, so while this is not a
complete fix it does hit some of the most important places.

Change-Id: Ic9b0455c2f8b085666862bc4495d9bad445dfeaf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4080991
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
This commit is contained in:
Bruce Dawson
2022-12-05 22:59:57 +00:00
committed by LUCI CQ
parent 8d16d4a754
commit 25334bb18e
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
goma_ctl.bat
View File

@@ -8,5 +8,9 @@
set scriptdir=%~dp0
@call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
if "%*" == "/?" (
@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_ctl.py --help
exit /b
)
@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_ctl.py %*
exit /b %ERRORLEVEL%