Browse Source

bpo-44125: Fix "make patchcheck" on non-English locale (GH-26102)

The patch from [bpo-44074]() does not account for a possibly non-English locale and blindly greps for "HEAD branch" in a possibly localized text.

Automerge-Triggered-By: GH:pitrou
pull/26114/head
Antoine Pitrou 5 years ago
committed by GitHub
parent
commit
1aa3530314
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      Tools/scripts/patchcheck.py

5
Tools/scripts/patchcheck.py

@ -78,11 +78,14 @@ def get_git_remote_default_branch(remote_name):
It is typically called 'main', but may differ
"""
cmd = "git remote show {}".format(remote_name).split()
env = os.environ.copy()
env['LANG'] = 'C'
try:
remote_info = subprocess.check_output(cmd,
stderr=subprocess.DEVNULL,
cwd=SRCDIR,
encoding='UTF-8')
encoding='UTF-8',
env=env)
except subprocess.CalledProcessError:
return None
for line in remote_info.splitlines():

Loading…
Cancel
Save