bot_update: Pass custom_vars dict to deps2git.

scripts/slave/bot_update.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import collections
@@ skipping 801 matching lines @@
     buildspec_path = 'releases'
     buildspec_version = m.group(1)
 
   git_buildspec = get_git_buildspec(buildspec_path, buildspec_version)
   with open(deps_git_file, 'wb') as f:
     f.write(git_buildspec)
 
 
 def ensure_deps2git(solution, shallow):
   repo_base = path.join(os.getcwd(), solution['name'])
+  custom_vars = solution.get('custom_vars')
   deps_file = path.join(repo_base, 'DEPS')
   deps_git_file = path.join(repo_base, '.DEPS.git')
   if not git('ls-files', 'DEPS', cwd=repo_base).strip():
     return
 
   print 'Checking if %s is newer than %s' % (deps_file, deps_git_file)
   if not need_to_run_deps2git(repo_base, deps_file, deps_git_file):
     return
 
   print '===DEPS file modified, need to run deps2git==='
   cmd = [sys.executable, DEPS2GIT_PATH,
          '--cache_dir', CACHE_DIR,
          '--deps', deps_file,
          '--out', deps_git_file]
+  if custom_vars:
+    cmd.extend(['--var_overrides', json.dumps(custom_vars)])

[kjellander_chromium, 2014/10/03 09:00:50]

I doublechecked that an empty custom_vars dict doesn't cause any problems.

   if 'chrome-internal.googlesource' in solution['url']:
     cmd.extend(['--extra-rules', S2G_INTERNAL_PATH])
   if shallow:
     cmd.append('--shallow')
   call(*cmd)
 
 
 def emit_log_lines(name, lines):
   for line in lines.splitlines():
     print '@@@STEP_LOG_LINE@%s@%s@@@' % (name, line)
@@ skipping 815 matching lines @@
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())