git-sync-deps: handle recursion and deps_os at the same time

tools/git-sync-deps

Index: tools/git-sync-deps
diff --git a/tools/git-sync-deps b/tools/git-sync-deps
index 717ab38055287dc2af9a0bdb4c814fcdca51fb79..b21b941c85682320e22ba1750caa749e0d3b4eb2 100755
--- a/tools/git-sync-deps
+++ b/tools/git-sync-deps
@@ -172,14 +172,12 @@ def git_sync_deps(deps_file_path, deps_os_list, verbose):
   deps_file_directory = os.path.dirname(deps_file_path)
   deps = parse_file_to_dict(deps_file_path)
   dependencies = deps['deps'].copy()
-  for deps_os in deps_os_list:
-    # Add OS-specific dependencies
-    if deps_os not in deps['deps_os']:
-      raise DepsError(
-        'Argument "%s" not found within deps_os keys %r' %
-        (deps_os, deps['deps_os'].keys()))
-    for dep in deps['deps_os'][deps_os]:
-      dependencies[dep] = deps['deps_os'][deps_os][dep]
+  if 'deps_os' in deps:
+    for deps_os in deps_os_list:

[mtklein, 2014/08/26 18:44:27]

deps_os -> os;

deps_os_list -> command_line_os_requests

+      # Add OS-specific dependencies
+      if deps_os in deps['deps_os']:

[mtklein, 2014/08/26 18:44:27]

deps -> deps_file

+        for dep in deps['deps_os'][deps_os]:
+          dependencies[dep] = deps['deps_os'][deps_os][dep]

[mtklein, 2014/08/26 18:44:27]

dependencies.update(deps['deps_os'][deps_os])

   list_of_arg_lists = []
   for directory in dependencies:
     if '@' in dependencies[directory]: