From cf69b459208f3e00a2d16270ff751b430dbc662b Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Tue, 24 Nov 2009 20:51:27 +0000 Subject: [PATCH] Fix using depot_tools from a git checkout on Windows. Review URL: http://codereview.chromium.org/437042 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32969 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gclient.bat b/gclient.bat index fa3c9891c..0639defd7 100755 --- a/gclient.bat +++ b/gclient.bat @@ -11,11 +11,6 @@ setlocal :: This is required with cygwin only. PATH=%~dp0;%PATH% -:: Shall skip automatic update? -IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :SKIP_UPDATE -:: We can't sync if .\.svn\. doesn't exist. -IF NOT EXIST "%~dp0.svn\." GOTO :SKIP_UPDATE - :: Will download svn and python. :: If you don't want to install the depot_tools version of these tools, remove :: the 'force' option on the next command. The tools won't be installed only if @@ -23,7 +18,12 @@ IF NOT EXIST "%~dp0.svn\." GOTO :SKIP_UPDATE call "%~dp0bootstrap\win\win_tools.bat" force if errorlevel 1 goto :EOF -:: Sync the bootstrap directory *only after*. +:: Shall skip automatic update? +IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :SKIP_UPDATE +:: We can't sync if .\.svn\. doesn't exist. +IF NOT EXIST "%~dp0.svn\." GOTO :SKIP_UPDATE + +:: Sync the bootstrap directory. call svn up -q "%~dp0bootstrap" :: still continue even in case of error. goto :UPDATE