diff options
| author | Andrew C <achow101@gmail.com> | 2016-01-23 10:35:27 -0500 |
|---|---|---|
| committer | Andrew C <achow101@gmail.com> | 2016-01-25 09:02:05 -0500 |
| commit | 5ed2f16480142f0887cc1a6257ff53e2abc3e5b6 (patch) | |
| tree | 8421ede108c2a6fb5c56c74cf94b63e652a7cc2b /contrib | |
| parent | f281caac48b964a5ddfdd26f4694463d693ae901 (diff) | |
| download | bitcoin-5ed2f16480142f0887cc1a6257ff53e2abc3e5b6.tar.xz | |
[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.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/devtools/github-merge.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py index 33d33b7005..11118fd7dd 100755 --- a/contrib/devtools/github-merge.py +++ b/contrib/devtools/github-merge.py @@ -153,7 +153,7 @@ def main(): # Run test command if configured. if testcmd: # 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) if subprocess.call(testcmd,shell=True): print("ERROR: Running %s failed." % testcmd,file=stderr) |