Reapply 231888 "Fixes for python 2.7.5 support." with fixes.

Tested to work now with the repro case of bug 313552.

"/c" was interpreted by cygwin's bash as a path and was replaced with c:/. :(
Using //c seems to be passed through properly.
There is probably other escaping problem but this should be good enough at
this stage.

Ref: http://www.mingw.org/wiki/Posix_path_conversion

R=iannucci@chromium.org
BUG=241769
BUG=313552

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@232184 0039d316-1c4b-4281-b951-d872f2087c98
experimental/szager/collated-output
maruel@chromium.org 12 years ago
parent 566c38251a
commit 4f4e76fce5

2
.gitignore vendored

@ -21,7 +21,7 @@
# Ignore locations where third-party tools are placed during bootstrapping. # Ignore locations where third-party tools are placed during bootstrapping.
/python_bin /python_bin
/python_274 /python275_bin
/git_bin /git_bin
/git-1.8.0_bin /git-1.8.0_bin
/svn_bin /svn_bin

@ -15,7 +15,7 @@ def CommonChecks(input_api, output_api, tests_to_black_list):
black_list = list(input_api.DEFAULT_BLACK_LIST) + [ black_list = list(input_api.DEFAULT_BLACK_LIST) + [
r'^cpplint\.py$', r'^cpplint\.py$',
r'^cpplint_chromium\.py$', r'^cpplint_chromium\.py$',
r'^python_274[\/\\].+', r'^python275_bin[\/\\].+',
r'^python_bin[\/\\].+', r'^python_bin[\/\\].+',
r'^site-packages-py[0-9]\.[0-9][\/\\].+', r'^site-packages-py[0-9]\.[0-9][\/\\].+',
r'^svn_bin[\/\\].+', r'^svn_bin[\/\\].+',

@ -20,8 +20,8 @@ fi
# Uncomment this line if you never use gclient. # Uncomment this line if you never use gclient.
# "$base_dir"/update_depot_tools # "$base_dir"/update_depot_tools
if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_cl.py "$@" PYTHONDONTWRITEBYTECODE=1 cmd.exe //c $base_dir\\python.bat $base_dir\\git_cl.py $@
else else
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_cl.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_cl.py" "$@"
fi fi

@ -14,8 +14,8 @@ else
base_dir=$(dirname "$0") base_dir=$(dirname "$0")
fi fi
if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_try.py "$@" PYTHONDONTWRITEBYTECODE=1 cmd.exe //c $base_dir\\python.bat $base_dir\\git_try.py $@
else else
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_try.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_try.py" "$@"
fi fi

@ -12,8 +12,8 @@ base_dir=$(dirname "$0")
OUTPUT="$(uname | grep 'MINGW')" OUTPUT="$(uname | grep 'MINGW')"
MINGW=$? MINGW=$?
if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/pylint.py "$@" PYTHONDONTWRITEBYTECODE=1 cmd.exe //c $base_dir\\python.bat $base_dir\\pylint.py $@
else else
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/pylint.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/pylint.py" "$@"
fi fi

Loading…
Cancel
Save