diff options
author | Hal Canary <halcanary@google.com> | 2018-06-20 10:28:37 -0400 |
---|---|---|
committer | Hal Canary <halcanary@google.com> | 2018-06-20 14:38:34 +0000 |
commit | 2c74c32a56025a872ddb05e851f071cd38f253fa (patch) | |
tree | b98ccf13e2384569f635c990c9621759c4bb68b5 /tools | |
parent | fba19c37f5693229ba5adfdc21db27c07803c4c5 (diff) |
tools/git-sync-deps: fix
Change-Id: I48363d75cfb1fc473c7f32e701ed3e6378059004
Reviewed-on: https://skia-review.googlesource.com/136072
Reviewed-by: Hal Canary <halcanary@google.com>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/git-sync-deps | 8 |
1 files changed, 4 insertions, 4 deletions
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: |