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

tools/git-sync-deps

 #!/usr/bin/python
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Parse a DEPS file and git checkout all of the dependencies.
 
 Args:
@@ skipping 154 matching lines @@
                  dictionary in the DEPS file.
 
   Raises DepsError exception and git Exceptions.
   """
   git = git_executable()
   assert git
 
   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]:
       repo, checkoutable = dependencies[directory].split('@', 1)
     else:
       repo, checkoutable = dependencies[directory], 'origin/master'
 
     relative_directory = os.path.join(deps_file_directory, directory)
 
     list_of_arg_lists.append(
@@ skipping 25 matching lines @@
   try:
     git_sync_deps(deps_file_path, argv, verbose)
     return 0
   except DepsError:
     usage(deps_file_path)
     return 1
 
 
 if __name__ == '__main__':
   exit(main(sys.argv[1:]))