From 76a4900e2e88d1a6ae56b98265131c98e35be490 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Fri, 22 Apr 2016 11:26:38 +0000 Subject: [PATCH] bot_update: call gclient sync after checking out a gerrit ref BUG=chromium:602906 Review URL: https://codereview.chromium.org/1904663002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300109 0039d316-1c4b-4281-b951-d872f2087c98 --- recipe_modules/bot_update/resources/bot_update.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe_modules/bot_update/resources/bot_update.py b/recipe_modules/bot_update/resources/bot_update.py index df60837d5..b8b3f0060 100755 --- a/recipe_modules/bot_update/resources/bot_update.py +++ b/recipe_modules/bot_update/resources/bot_update.py @@ -1338,8 +1338,8 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only, # Let gclient do the DEPS syncing. # The branch-head refspec is a special case because its possible Chrome # src, which contains the branch-head refspecs, is DEPSed in. - gclient_output = gclient_sync(buildspec or BRANCH_HEADS_REFSPEC in refs, - shallow) + with_branch_heads = (buildspec or BRANCH_HEADS_REFSPEC in refs) + gclient_output = gclient_sync(with_branch_heads, shallow) # Now that gclient_sync has finished, we should revert any .DEPS.git so that # presubmit doesn't complain about it being modified. @@ -1366,6 +1366,7 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only, apply_issue_key_file, blacklist=already_patched) elif gerrit_ref: apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset) + gclient_sync(with_branch_heads, shallow) # Reset the deps_file point in the solutions so that hooks get run properly. for sln in solutions: