Fix a bug in gclient recurse for git-svn users. Make gclient_utils.CheckCall more versatile.

gclient.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 870 matching lines @@
     scm_set.update(scm.split(','))
 
   # Pass in the SCM type as an env variable
   env = os.environ.copy()
 
   for path, url in entries.iteritems():
     scm = gclient_scm.GetScmName(url)
     if scm_set and scm not in scm_set:
       continue
     cwd = os.path.normpath(os.path.join(root, path))
-    env['GCLIENT_SCM'] = scm
-    env['GCLIENT_URL'] = url
-    subprocess.Popen(args, cwd=cwd, env=env).communicate()
+    if scm:
+      env['GCLIENT_SCM'] = scm
+    if url:
+      env['GCLIENT_URL'] = url
+    gclient_utils.Popen(args, cwd=cwd, env=env).communicate()
+  return 0
 
 
 @attr('usage', '[url] [safesync url]')
 def CMDconfig(parser, args):
   """Create a .gclient file in the current directory.
 
 This specifies the configuration for further commands. After update/sync,
 top-level DEPS files in each module are read to determine dependent
 modules to operate on as well. If optional [url] parameter is
 provided, then configuration is read from a specified Subversion server
@@ skipping 330 matching lines @@
     return CMDhelp(parser, argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: