Exclude nested submodules properly. This never worked.

scripts/slave/recipe_modules/sync_submodules/resources/deps2submodules.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Read DEPS and use the information to update git submodules"""
 
 import argparse
 import logging
 import os
@@ skipping 18 matching lines @@
   for name, value in submods.iteritems():
     if not name.startswith(path_prefix):
       logging.warning('Dropping submodule "%s", because it is outside the '
                       'working directory "%s"', name, path_prefix)
       continue
     # Strip the prefix from the submodule name.
     name = name[len(path_prefix):]
 
     parts = name.split('/')[:-1]
     while parts:
-      may_conflict = '/'.join(parts)
+      may_conflict = path_prefix + '/'.join(parts)
       if may_conflict in submods:
         logging.warning('Dropping submodule "%s", because it is nested in '
                         'submodule "%s"', name, may_conflict)
         break
       parts.pop()
-
-    ret[name] = value
+    else:
+      ret[name] = value
   return ret
 
 
 def CollateDeps(deps_content):
   """
   Take the output of deps_utils.GetDepsContent and return a hash of:
 
   { submod_name : [ [ submod_os, ... ], submod_url, submod_sha1 ], ... }
   """
   spliturl = lambda x: list(x.partition('@')[0::2]) if x else [None, None]
@@ skipping 91 matching lines @@
           options.path_prefix))
   RemoveObsoleteSubmodules()
   for submod_path, submod_sha1 in adds.iteritems():
     subprocess.check_call(['git', 'update-index', '--add',
                            '--cacheinfo', '160000', submod_sha1, submod_path])
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())