tools/git-sync-deps: fix
Change-Id: I48363d75cfb1fc473c7f32e701ed3e6378059004
Reviewed-on: https://skia-review.googlesource.com/136072
Reviewed-by: Hal Canary <halcanary@google.com>
diff --git a/tools/git-sync-deps b/tools/git-sync-deps
index 7599eac..c7379c0 100755
--- a/tools/git-sync-deps
+++ b/tools/git-sync-deps
@@ -204,6 +204,10 @@
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 @@
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: