bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

tools: win: Fix grep usage with system Git (see #3836)

Browse Source
This commit is contained in:
Marshall Greenblatt
2025-02-19 12:05:35 -05:00
parent 64bb2aadd5
commit 0c25276083
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/git_util.py
View File

@ -8,8 +8,8 @@ import os
import sys
if sys.platform == 'win32':
# Force use of the git version bundled with depot_tools.
git_exe = 'git.bat'
# Force use of the system installed Git version.
git_exe = 'git.exe'
else:
git_exe = 'git'
@ -30,6 +30,15 @@ def exec_git_cmd(args, path='.'):
""" Executes a git command with the specified |args|. """
cmd = "%s %s" % (git_exe, args)
result = exec_cmd(cmd, path)
if result['ret'] != 0:
sys.stderr.write('Command \"%s\" exited with retval %d\n' % (cmd,
result['ret']))
if result['err'] != '':
err = result['err'].strip()
if sys.platform == 'win32':
# Convert to Unix line endings.
err = err.replace('\r\n', '\n')
sys.stderr.write(err + '\n')
if result['out'] != '':
out = result['out'].strip()
if sys.platform == 'win32':