From 0cb8ad55f6deeea0678a725296848ec671f83aba Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Mon, 27 Aug 2018 14:06:38 -0600 Subject: [PATCH] tooling: Fix update sources script for Python 3 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. --- update_glslang_sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_glslang_sources.py b/update_glslang_sources.py index a1cc0380..65be2f6a 100755 --- a/update_glslang_sources.py +++ b/update_glslang_sources.py @@ -96,7 +96,7 @@ class GoodCommit(object): def AddRemote(self): """Add the remote 'known-good' if it does not exist.""" 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) def HasCommit(self):