experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consistently use bytes for git version tracking for Python3 compatibility (#5318)

Browse Source
This commit is contained in:
Aki Sukegawa 2016-11-02 13:54:02 +09:00 committed by Vijay Vasudevan
parent f7ec99516c
commit 7443479c92
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tensorflow/tools/git/gen_git_source.py
View File

@ -147,8 +147,10 @@ def get_git_version(git_base_path):
""" """
unknown_label = b"unknown" unknown_label = b"unknown"
try: try:
val = subprocess.check_output(["git", str("--git-dir="+git_base_path+"/.git"), str("--work-tree="+git_base_path), "describe", val = bytes(subprocess.check_output([
"--long", "--dirty", "--tags"]).strip() "git", str("--git-dir=%s/.git" % git_base_path),
str("--work-tree=" + git_base_path), "describe", "--long", "--dirty", "--tags"
]).strip())
return val if val else unknown_label return val if val else unknown_label
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
return unknown_label return unknown_label
@ -199,7 +201,7 @@ def generate(arglist):
data = json.load(open(spec)) data = json.load(open(spec))
git_version = None git_version = None
if not data["git"]: if not data["git"]:
git_version = "unknown" git_version = b"unknown"
else: else:
old_branch = data["branch"] old_branch = data["branch"]
new_branch = parse_branch_ref(head_symlink) new_branch = parse_branch_ref(head_symlink)