Commit 1561be96 authored by maruel@chromium.org's avatar maruel@chromium.org

Revert partially r200799, it would break the official builders.

Until r200514 is merged into every active branches on Windows, python can't be
upgraded to 2.7.x.

TBR=iannucci@chromium.org,joi@chromium.org
BUG=241769

Review URL: https://codereview.chromium.org/15294005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@200800 0039d316-1c4b-4281-b951-d872f2087c98
parent 9e6dd687
......@@ -4,5 +4,5 @@
:: found in the LICENSE file.
setlocal
set PATH=%~dp0python_274;%PATH%
"%~dp0python_274\python.exe" %*
set PATH=%~dp0python_bin;%PATH%
"%~dp0python_bin\python.exe" %*
......@@ -126,8 +126,8 @@ goto :END
:PYTHON_INSTALL
echo Installing python ...
:: Cleanup python directory if it was existing.
if exist "%WIN_TOOLS_ROOT_DIR%\python_274\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python_274"
call svn co -q %WIN_TOOLS_ROOT_URL%/third_party/python_274 "%WIN_TOOLS_ROOT_DIR%\python_274"
if exist "%WIN_TOOLS_ROOT_DIR%\python_bin\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python_bin"
call svn co -q %WIN_TOOLS_ROOT_URL%/third_party/python_26 "%WIN_TOOLS_ROOT_DIR%\python_bin"
if errorlevel 1 goto :PYTHON_FAIL
:: Create the batch files.
call copy /y "%~dp0python.new.bat" "%WIN_TOOLS_ROOT_DIR%\python.bat" 1>nul
......@@ -138,7 +138,7 @@ goto :END
:PYTHON_FAIL
echo ... Failed to checkout python automatically.
echo Please visit http://python.org to download the latest python 2.7.x client before
echo Please visit http://python.org to download the latest python 2.x client before
echo continuing.
echo You can also get the "prebacked" version used at %WIN_TOOLS_ROOT_URL%/third_party/
set ERRORLEVEL=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment