This is an archive of the discontinued LLVM Phabricator instance.

gn build: Fix Python 3 write_vcsrevision script compatibility
ClosedPublic

Authored by andrew-boyarshin on Jan 31 2019, 3:39 AM.

Reviewers

phosek
serge-sans-paille

Commits

Summary

Trivial fix: decode was not called for all subprocess.check_output calls.

LGTM

This revision is now accepted and ready to land.Feb 1 2019, 9:30 PM

@andrew-boyarshin do you have commit right?

@serge-sans-paille No, this is my first patch to LLVM and first time to Phabricator.

This revision was automatically updated to reflect the committed changes.

@andrew-boyarshin : It's in! Thanks for the contribution o/

Path

Size

llvm/

trunk/

utils/

gn/

build/

2 lines

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines	def main():
git, use_shell = which('git'), False		git, use_shell = which('git'), False
if not git:		if not git:
git = which('git.exe')		git = which('git.exe')
if not git:		if not git:
git = which('git.bat')		git = which('git.bat')
use_shell = True		use_shell = True

git_dir = subprocess.check_output([git, 'rev-parse', '--git-dir'],		git_dir = subprocess.check_output([git, 'rev-parse', '--git-dir'],
cwd=LLVM_DIR, shell=use_shell).strip()		cwd=LLVM_DIR, shell=use_shell).decode().strip()
if not os.path.isdir(git_dir):		if not os.path.isdir(git_dir):
print('.git dir not found at "%s"' % git_dir, file=sys.stderr)		print('.git dir not found at "%s"' % git_dir, file=sys.stderr)
return 1		return 1

rev = subprocess.check_output([git, 'rev-parse', '--short', 'HEAD'],		rev = subprocess.check_output([git, 'rev-parse', '--short', 'HEAD'],
cwd=git_dir, shell=use_shell).decode().strip()		cwd=git_dir, shell=use_shell).decode().strip()
# FIXME: add pizzas such as the svn revision read off a git note?		# FIXME: add pizzas such as the svn revision read off a git note?
vcsrevision_contents = '#define LLVM_REVISION "git-%s"\n' % rev		vcsrevision_contents = '#define LLVM_REVISION "git-%s"\n' % rev
Show All 20 Lines