Issue 15294005: Revert partially r200799, it would break the official builders.

Issue 15294005: Revert partially r200799, it would break the official builders. (Closed)

Created:
7 years, 7 months ago by M-A Ruel

Modified:
7 years, 7 months ago

Reviewers:
iannucci1, iannucci, Jói

CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, iannucci+depot_tools_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Visibility:
Public.

More Reviews

Description

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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=200800

Patch Set 1 #

Patch Set 2 : keep copyright, keep diff at minimum #

Patch Set 3 : (bis) #

Created: 7 years, 7 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+5 lines, -5 lines)			Patch
	M	bootstrap/win/python.new.bat	View	1 2	1 chunk	+2 lines, -2 lines	0 comments	Download
	M	bootstrap/win/win_tools.bat	View		2 chunks	+3 lines, -3 lines	0 comments	Download

Messages

Total messages: 3 (0 generated)

Expand Messages | Collapse Messages

Jói

LGTM On Fri, May 17, 2013 at 6:08 AM, <maruel@chromium.org> wrote: > Reviewers: iannucci, Jói, ...

7 years, 7 months ago (2013-05-17 16:37:01 UTC) #2

LGTM

On Fri, May 17, 2013 at 6:08 AM,  <maruel@chromium.org> wrote:
> Reviewers: iannucci, Jói,
>
> Message:
> Committed patchset #3 manually as r200800.
>
> Description:
> 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
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=200800
>
> Please review this at https://codereview.chromium.org/15294005/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
>
> Affected files:
>   M bootstrap/win/python.new.bat
>   M bootstrap/win/win_tools.bat
>
>
> Index: bootstrap/win/python.new.bat
> diff --git a/bootstrap/win/python.new.bat b/bootstrap/win/python.new.bat
> index
>
e3f86aca2e418aa2342c56784c8f8fd2d93cb08c..b7ee9463191b63c5f4edf3754522bedbb1e3ef23
> 100644
> --- a/bootstrap/win/python.new.bat
> +++ b/bootstrap/win/python.new.bat
> @@ -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" %*
> Index: bootstrap/win/win_tools.bat
> diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat
> index
>
29e766888b4a6678b83c7685f6bf8e64dc13ee45..e2c951122731f424cccf81744309ebb820765f86
> 100644
> --- a/bootstrap/win/win_tools.bat
> +++ b/bootstrap/win/win_tools.bat
> @@ -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
>
>

Message was sent while issue was closed.

lgtm

Expand Messages | Collapse Messages