From fa403b9691f575c26d5bc56e1c472ce5be900d0f Mon Sep 17 00:00:00 2001
From: Karl Schultz <karl@lunarg.com>
Date: Thu, 21 Jun 2018 17:30:07 -0600
Subject: [PATCH] script: Improve update sources script
- remove unused variable to pass pylint
- Use another approach to detect if known-good remote is already
present to avoid the need for "ignore following errors" message.
---
update_glslang_sources.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/update_glslang_sources.py b/update_glslang_sources.py
index 550bc2b14..a1cc0380a 100755
--- a/update_glslang_sources.py
+++ b/update_glslang_sources.py
@@ -66,7 +66,7 @@ def command_retval(cmd, directory):
p = subprocess.Popen(cmd,
cwd=directory,
stdout=subprocess.PIPE)
- (stdout, _) = p.communicate()
+ p.communicate()
return p.returncode
@@ -95,8 +95,8 @@ class GoodCommit(object):
def AddRemote(self):
"""Add the remote 'known-good' if it does not exist."""
- print('Ignore "fatal" errors for missing known-good remote:')
- if command_retval(['git', 'remote', 'show', 'known-good'], self.subdir) != 0:
+ remotes = command_output(['git', 'remote'], self.subdir).splitlines()
+ if 'known-good' not in remotes:
command_output(['git', 'remote', 'add', 'known-good', self.GetUrl()], self.subdir)
def HasCommit(self):
--
GitLab