UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix symbol dumping to work on ancient python versions.

Browse Source
This commit is contained in:
Asher Baker 2015-11-05 10:46:32 +00:00
parent 2c03498986
commit ed5771a861
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/buildbot/upload_symbols.py
View File

@ -29,8 +29,8 @@ out = stdout.decode('utf8')
err = stdout.decode('utf8') err = stdout.decode('utf8')
with open(symbol_file, 'w') as fp: with open(symbol_file, 'w') as fp:
fp.write(stdout) fp.write(out)
fp.write(stderr) fp.write(err)
lines = out.splitlines() lines = out.splitlines()
@ -55,16 +55,23 @@ for line in lines:
rev = None rev = None
with open(os.devnull, 'w') as devnull: with open(os.devnull, 'w') as devnull:
def runCommand(argv):
proc = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=devnull, cwd=path, universal_newlines=True)
procout, procerr = proc.communicate()
if proc.returncode:
raise RuntimeError('Failed to execute \'' + ' '.join(argv) + '\' = ' + proc.returncode)
return procout.strip()
try: try:
root = subprocess.check_output(['git', 'rev-parse', '--show-toplevel'], stderr=devnull, cwd=path, universal_newlines=True).strip() root = runCommand(['git', 'rev-parse', '--show-toplevel'])
root = os.path.normcase(root) root = os.path.normcase(root)
if root in roots: if root in roots:
continue continue
url = subprocess.check_output(['git', 'ls-remote', '--get-url', 'origin'], stderr=devnull, cwd=path, universal_newlines=True).strip() url = runCommand(['git', 'ls-remote', '--get-url', 'origin'])
rev = subprocess.check_output(['git', 'log', '--pretty=format:%H', '-n', '1'], stderr=devnull, cwd=path, universal_newlines=True).strip() rev = runCommand(['git', 'log', '--pretty=format:%H', '-n', '1'])
except (OSError, subprocess.CalledProcessError): except (OSError, RuntimeError):
continue continue
roots[root] = (url, rev) roots[root] = (url, rev)
@ -77,7 +84,7 @@ for root, info in roots.items():
lines.insert(index, 'INFO REPO ' + ' '.join([info[1], info[0], root])) lines.insert(index, 'INFO REPO ' + ' '.join([info[1], info[0], root]))
index += 1; index += 1;
out = os.linesep.join(lines) out = os.linesep.join(lines).encode('utf8')
request = urllib.Request(SYMBOL_SERVER, out) request = urllib.Request(SYMBOL_SERVER, out)
request.add_header('Content-Type', 'text/plain') request.add_header('Content-Type', 'text/plain')