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

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 1047 matching lines @@
     text += ('\n'.join([f[0] + f[1] for f in affected_files]) + '\n' +
             separator2)
   text += '\n'.join([f[0] + f[1] for f in unaffected_files]) + '\n'
 
   handle, filename = tempfile.mkstemp(text=True)
   os.write(handle, text)
   os.close(handle)
 
   # 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:
       subprocess.check_call(cmd)
     result = gclient_utils.FileRead(filename, 'r')
   finally:
     os.remove(filename)
 
   if not result:
     return 0
@@ skipping 319 matching lines @@
     if e.code != 500:
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))