Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(636)

Unified Diff: scripts/slave/bot_update.py

Issue 623093002: bot_update: Pass custom_vars dict to deps2git. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/bot_update.py
diff --git a/scripts/slave/bot_update.py b/scripts/slave/bot_update.py
index bbba3e4ce8aaba077044c20f79a9c034a194881e..da16ae8405de56ac91143c7abd3e701d293621ca 100755
--- a/scripts/slave/bot_update.py
+++ b/scripts/slave/bot_update.py
@@ -819,6 +819,7 @@ def buildspecs2git(sln_dir, 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():
@@ -833,6 +834,8 @@ def ensure_deps2git(solution, shallow):
'--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 doe
if 'chrome-internal.googlesource' in solution['url']:
cmd.extend(['--extra-rules', S2G_INTERNAL_PATH])
if shallow:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698