bpo-32256: Make patchcheck.py work for out-of-tree builds (GH-4760)
Set SRCDIR as the current directory for git.
This commit is contained in:
parent
d5b4f1b5a0
commit
aa95bfb5fe
|
@ -48,7 +48,9 @@ def get_git_branch():
|
||||||
"""Get the symbolic name for the current git branch"""
|
"""Get the symbolic name for the current git branch"""
|
||||||
cmd = "git rev-parse --abbrev-ref HEAD".split()
|
cmd = "git rev-parse --abbrev-ref HEAD".split()
|
||||||
try:
|
try:
|
||||||
return subprocess.check_output(cmd, stderr=subprocess.DEVNULL)
|
return subprocess.check_output(cmd,
|
||||||
|
stderr=subprocess.DEVNULL,
|
||||||
|
cwd=SRCDIR)
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
@ -60,7 +62,9 @@ def get_git_upstream_remote():
|
||||||
"""
|
"""
|
||||||
cmd = "git remote get-url upstream".split()
|
cmd = "git remote get-url upstream".split()
|
||||||
try:
|
try:
|
||||||
subprocess.check_output(cmd, stderr=subprocess.DEVNULL)
|
subprocess.check_output(cmd,
|
||||||
|
stderr=subprocess.DEVNULL,
|
||||||
|
cwd=SRCDIR)
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
return "origin"
|
return "origin"
|
||||||
return "upstream"
|
return "upstream"
|
||||||
|
@ -98,7 +102,9 @@ def changed_files(base_branch=None):
|
||||||
else:
|
else:
|
||||||
cmd = 'git status --porcelain'
|
cmd = 'git status --porcelain'
|
||||||
filenames = []
|
filenames = []
|
||||||
with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) as st:
|
with subprocess.Popen(cmd.split(),
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
cwd=SRCDIR) as st:
|
||||||
for line in st.stdout:
|
for line in st.stdout:
|
||||||
line = line.decode().rstrip()
|
line = line.decode().rstrip()
|
||||||
status_text, filename = line.split(maxsplit=1)
|
status_text, filename = line.split(maxsplit=1)
|
||||||
|
|
Loading…
Reference in New Issue