Browse Source

[devtools] github-merge get toplevel dir without extra whitespace

Fixes a bug in github merge when it runs the tests where the toplevel directory has an extra '\n' appended to the path string. Now it doesn't.
0.13
Andrew C 9 years ago
parent
commit
5ed2f16480
  1. 2
      contrib/devtools/github-merge.py

2
contrib/devtools/github-merge.py

@ -153,7 +153,7 @@ def main():
# Run test command if configured. # Run test command if configured.
if testcmd: if testcmd:
# Go up to the repository's root. # Go up to the repository's root.
toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel']) toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel']).strip()
os.chdir(toplevel) os.chdir(toplevel)
if subprocess.call(testcmd,shell=True): if subprocess.call(testcmd,shell=True):
print("ERROR: Running %s failed." % testcmd,file=stderr) print("ERROR: Running %s failed." % testcmd,file=stderr)

Loading…
Cancel
Save