bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

automate-git.py: Fix application of DEPS.patch

This commit is contained in:
Marshall Greenblatt 2017-09-12 15:57:56 -04:00
parent 3f48f8ec54
commit c1269e105d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/automate/automate-git.py
View File

@ -268,8 +268,8 @@ def apply_deps_patch():
if os.path.isfile(deps_path): if os.path.isfile(deps_path):
msg("Chromium DEPS file: %s" % (deps_path)) msg("Chromium DEPS file: %s" % (deps_path))
patch_file = os.path.join(cef_dir, 'patch', 'patches', deps_file + '.patch') patch_file = os.path.join(cef_dir, 'patch', 'patches', deps_file)
if os.path.exists(patch_file): if os.path.exists(patch_file + ".patch"):
# Attempt to apply the DEPS patch file that may exist with newer branches. # Attempt to apply the DEPS patch file that may exist with newer branches.
patch_tool = os.path.join(cef_dir, 'tools', 'patcher.py') patch_tool = os.path.join(cef_dir, 'tools', 'patcher.py')
run('%s %s --patch-file "%s" --patch-dir "%s"' % run('%s %s --patch-file "%s" --patch-dir "%s"' %