mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tooling: Fix update sources script for Python 3

Browse Source 
This one small change allows the update_glslang_sources.py script to operate correctly with Python 2 and Python 3.

Change the string literal type to "bytes" so that it matches the type returned by the subprocess calls.  Otherwise, under Python 3, the search for "known-good" in the list of remotes always fails.  This is OK for the first execution of update_glsang_sources, since the remote is not there on the first run.  But on subsequent runs, the search still fails to match and the script stops when trying to create a remote that already exists.
This commit is contained in:
Karl Schultz 2018-08-27 14:06:38 -06:00 committed by GitHub
parent 1323bf8e39
commit 0cb8ad55f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
update_glslang_sources.py
View File

@ -96,7 +96,7 @@ class GoodCommit(object):
def AddRemote(self): def AddRemote(self):
"""Add the remote 'known-good' if it does not exist.""" """Add the remote 'known-good' if it does not exist."""
remotes = command_output(['git', 'remote'], self.subdir).splitlines() remotes = command_output(['git', 'remote'], self.subdir).splitlines()
if 'known-good' not in remotes: if b'known-good' not in remotes:
command_output(['git', 'remote', 'add', 'known-good', self.GetUrl()], self.subdir) command_output(['git', 'remote', 'add', 'known-good', self.GetUrl()], self.subdir)
def HasCommit(self): def HasCommit(self):