From 23510f2c293813bea01f389ae189af28d38d9bd3 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 25 Oct 2016 11:04:57 -0400 Subject: bin/sync: call fetch-gn when DEPS changes Change-Id: Ifb2a364df1a8817152a2c1e79748d14534a9e523 Reviewed-on: https://skia-review.googlesource.com/3904 Reviewed-by: Mike Klein Commit-Queue: Hal Canary --- bin/sync | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'bin') diff --git a/bin/sync b/bin/sync index 34bfc643f4..154acbc300 100755 --- a/bin/sync +++ b/bin/sync @@ -68,17 +68,18 @@ if current_deps_hash != deps_hash: if not os.path.isfile('.gclient'): with open('.gclient', 'w') as o: o.write(default_gclient_config) - gclient_sync_command = [gclient, 'sync'] + skia_opt_deps - try: - sys.stdout.write('%r\n' % gclient_sync_command) - subprocess.check_call(gclient_sync_command) - except: - sys.stderr.write('\n`gclient sync` failed.\n') + for command in [[gclient, 'sync'] + skia_opt_deps, + ['python', os.path.join('bin', 'fetch-gn')]]: try: - os.remove('.deps_sha1') # Unknown state. + sys.stdout.write('%r\n' % command) + subprocess.check_call(command) except: - pass - exit(1) + sys.stderr.write('\n%r failed.\n' % command) + try: + os.remove('.deps_sha1') # Unknown state. + except: + pass + exit(1) # Only write hash after a successful sync. with open('.deps_sha1', 'w') as o: o.write(deps_hash) -- cgit v1.2.3