From 2c74c32a56025a872ddb05e851f071cd38f253fa Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 20 Jun 2018 10:28:37 -0400 Subject: tools/git-sync-deps: fix Change-Id: I48363d75cfb1fc473c7f32e701ed3e6378059004 Reviewed-on: https://skia-review.googlesource.com/136072 Reviewed-by: Hal Canary --- tools/git-sync-deps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/git-sync-deps b/tools/git-sync-deps index 7599eacbcb..c7379c0b5c 100755 --- a/tools/git-sync-deps +++ b/tools/git-sync-deps @@ -204,6 +204,10 @@ def git_sync_deps(deps_file_path, command_line_os_requests, verbose): raise Exception('%r is parent of %r' % (other_dir, directory)) list_of_arg_lists = [] for directory in sorted(dependencies): + if not isinstance(dependencies[directory], basestring): + if verbose: + print 'Skipping "%s".' % directory + continue if '@' in dependencies[directory]: repo, checkoutable = dependencies[directory].split('@', 1) else: @@ -216,10 +220,6 @@ def git_sync_deps(deps_file_path, command_line_os_requests, verbose): multithread(git_checkout_to_directory, list_of_arg_lists) - for directory in deps_file.get('recursedeps', []): - recursive_path = os.path.join(deps_file_directory, directory, 'DEPS') - git_sync_deps(recursive_path, command_line_os_requests, verbose) - def multithread(function, list_of_arg_lists): # for args in list_of_arg_lists: -- cgit v1.2.3