Commit 44855b94 authored by Dirk Pranke's avatar Dirk Pranke Committed by Commit Bot

Revert "[bootstraps] Sync at gclient, suppress output."

This reverts commit 4d92fe43.

Reason for revert: This moved the logging from invoking `led` or `vpython` to whenever someone would run something that would end up invoking `update_depot_tools`. It's good that we are calling this when we run update_depot_tools, but we probably should've suppressed the logging there in at least the success case, because now things are even more confusing. See crbug.com/748651.

Original change's description:
> [bootstraps] Sync at gclient, suppress output.
> 
> Have the "update_depot_tools" script also do a CIPD tool sync. This will
> ensure that users and systems have access to tooling at sync-time rather
> than just-in-time loading them at execution time.
> 
> Update the tool boostraps to suppress any sort of syncing logic, if it
> does happen. This will ensure that users who execute the tools don't se
> unexpected output.
> 
> BUG=None
> TEST=local
>   - Tested on Mac and Windows.
> 
> R=​dpranke@chromium.org, iannucci@chromium.org
> 
> Change-Id: I8efce8c73cc4e82ffdf5067ba9b917119a81e843
> Reviewed-on: https://chromium-review.googlesource.com/581494
> Commit-Queue: Daniel Jacques <dnj@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

TBR=iannucci@chromium.org,dpranke@chromium.org,dnj@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: None
Change-Id: I2485c9dd2e48a8dbdeebfff5da9d4c708e0edcb7
Reviewed-on: https://chromium-review.googlesource.com/585867Reviewed-by: 's avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
parent 393ba066
......@@ -9,7 +9,7 @@
/*.py recipes
/*.sh recipes
# Extensionless tools we want and support scripts.
# Extensionless tools we want
/apply_issue recipes
/clang* recipes
/depot-tools-auth recipes
......
......@@ -7,6 +7,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null
cipd_bin_setup
exec "$MYPATH/.cipd_bin/led" "$@"
......@@ -3,5 +3,5 @@
:: Use of this source code is governed by a BSD-style license that can be
:: found in the LICENSE file.
call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
call "%~dp0\cipd_bin_setup.bat"
"%~dp0\.cipd_bin\led.exe" %*
......@@ -179,10 +179,6 @@ class GClientSmoke(GClientSmokeBase):
self.check(res, self.gclient(['update']))
def testConfig(self):
# Get anhy bootstrapping out of the way.
results = self.gclient(['version'])
self.assertEquals(results[2], 0)
p = join(self.root_dir, '.gclient')
def test(cmd, expected):
if os.path.exists(p):
......
......@@ -112,17 +112,11 @@ function update_git_repo {
}
# Update git checkouts.
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
if [ -e "$base_dir/.git" ]; then
cd $base_dir
update_git_repo
cd - > /dev/null
fi
# Sync CIPD and CIPD client tools.
source "$base_dir/cipd_bin_setup.sh"
cipd_bin_setup
find "$base_dir" -iname "*.pyc" -exec rm -f {} \;
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
then
cd $base_dir
update_git_repo
cd - > /dev/null
fi
find "$base_dir" -iname "*.pyc" -exec rm -f {} \;
......@@ -52,10 +52,5 @@ for /F %%x in ('git config --get remote.origin.url') DO (
)
call git fetch -q origin > NUL
call git rebase -q origin/master > NUL
if errorlevel 1 (
echo Failed to update depot_tools.
goto :EOF
)
:: Sync CIPD and CIPD client tools.
call "%~dp0\cipd_bin_setup.bat"
if errorlevel 1 echo Failed to update depot_tools.
goto :EOF
......@@ -7,6 +7,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null
cipd_bin_setup
exec "$MYPATH/.cipd_bin/vpython" "$@"
......@@ -3,5 +3,5 @@
:: Use of this source code is governed by a BSD-style license that can be
:: found in the LICENSE file.
call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
call "%~dp0\cipd_bin_setup.bat"
"%~dp0\.cipd_bin\vpython.exe" %*
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment