Commit 7888d979 authored by jam@chromium.org's avatar jam@chromium.org

Revert 77954 - Use TERM to distinguish between console and msysgit.

It is cleaner this way since in Win32 console, the
value is always "dumb" while in msysgit it is always
"msys" The user shouldn't change the value of $TERM
in msysgit otherwise their whole copy of msysgit
will be flaky.

BUG=70548
TEST=check $TERM in windows

Review URL: http://codereview.chromium.org/6686027

TBR=mhm@chromium.org
Review URL: http://codereview.chromium.org/6683033

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@77972 0039d316-1c4b-4281-b951-d872f2087c98
parent 330f5347
......@@ -1065,8 +1065,9 @@ def CMDchange(args):
# Open up the default editor in the system to get the CL description.
cmd = [GetEditor(), filename]
if sys.platform == 'win32' and os.environ['TERM'] == 'msys':
# Msysgit requires the usage of 'env' to be present.
if sys.platform == 'win32' and 'mingw\\bin' in os.environ['PATH']:
# Msysgit requires the usage of 'env' to be present. The only way to
# accomplish that is by reading the environment variable for mingw\bin.
cmd.insert(0, 'env')
try:
if not silent:
......
......@@ -712,8 +712,9 @@ def UserEditedLog(starting_text):
# Open up the default editor in the system to get the CL description.
cmd = [editor, filename]
if sys.platform == 'win32' and os.environ['TERM'] == 'msys':
# Msysgit requires the usage of 'env' to be present.
if sys.platform == 'win32' and 'mingw\\bin' in os.environ['PATH']:
# Msysgit requires the usage of 'env' to be present. The only way to
# accomplish that is by reading the environment variable for mingw\bin.
cmd.insert(0, 'env')
try:
subprocess.check_call(cmd)
......
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