From a69d56c8ac00bc1138200281e5a66af148f41ad0 Mon Sep 17 00:00:00 2001 From: "tandrii@chromium.org" Date: Mon, 25 Apr 2016 19:20:59 +0000 Subject: [PATCH] Revert of bot_update: call gclient sync after checking out a gerrit ref (patchset #1 id:1 of https://codereview.chromium.org/1904663002/ ) Reason for revert: I believe this is mostly likely to have broken Angle, but this is speculative. http://crbug.com/606150 Original issue's description: > bot_update: call gclient sync after checking out a gerrit ref > > BUG=chromium:602906 > > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300109 TBR=hinoka@chromium.org,yyanagisawa@chromium.org,hinoka@google.com,phajdan.jr@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=chromium:602906 Review URL: https://codereview.chromium.org/1918903003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300159 0039d316-1c4b-4281-b951-d872f2087c98 --- recipe_modules/bot_update/resources/bot_update.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe_modules/bot_update/resources/bot_update.py b/recipe_modules/bot_update/resources/bot_update.py index b8b3f0060b..df60837d5e 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. - with_branch_heads = (buildspec or BRANCH_HEADS_REFSPEC in refs) - gclient_output = gclient_sync(with_branch_heads, shallow) + gclient_output = gclient_sync(buildspec or BRANCH_HEADS_REFSPEC in refs, + shallow) # Now that gclient_sync has finished, we should revert any .DEPS.git so that # presubmit doesn't complain about it being modified. @@ -1366,7 +1366,6 @@ 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: