mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: make apply_all_patches.py work in both python2 and python3 (#19872)

Browse source
This commit is contained in:
Charles Kerr 2019-08-23 17:48:27 -05:00 • committed by Samuel Attard
parent 81e9dab52f
commit ef6d4a46c2
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
script/apply_all_patches.py
View file

@ -11,7 +11,7 @@ from lib.patches import patch_from_dir
def apply_patches(dirs):
threeway = os.environ.get("ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES")
for patch_dir, repo in dirs.iteritems():
for patch_dir, repo in dirs.items():
git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
threeway=threeway is not None,
committer_name="Electron Scripts", committer_email="scripts@electron")