From 9f9d82ac944eb5146230dc9ca43a05608148f7d9 Mon Sep 17 00:00:00 2001 From: Daniel Jacques Date: Thu, 27 Jul 2017 14:21:21 +0000 Subject: [PATCH] Revert "[cipd] Bump version, log at warning." This reverts commit 18aa2d93ed97e61163fb5795cd3e695f4a73d7c8. Reason for revert: Original change's description: > [cipd] Bump version, log at warning. > > Bump the CIPD client version to > e2a98b41adb3403b5b7771c4101b42a55dc2dd9e. This version inculdes support > for the "-log-level" flag. > > Update CIPD bootstrap scripts and tool installation scripts to log at > warning level, so that standard operation doesn't produce any logs. > > BUG=chromium:748651 > TEST=canary > - Tested this CIPD version on canary waterfall successfully. > - Tested "gclient" bootstrap and "vpython" / "led" on Windows system, > no output and works. > - Tested "vpython" / "led" on OSX system, no output and works. > > Change-Id: Iae316908283c43c504f293aafdf897df83dccf8d > Reviewed-on: https://chromium-review.googlesource.com/588889 > Reviewed-by: Robbie Iannucci > Commit-Queue: Daniel Jacques TBR=iannucci@chromium.org,dnj@chromium.org Change-Id: Ia611c1aeb204c609ff3469076b8256c54e702230 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:748651 Reviewed-on: https://chromium-review.googlesource.com/589527 Reviewed-by: Daniel Jacques Commit-Queue: Daniel Jacques --- bootstrap/win/win_tools.bat | 2 +- cipd | 6 ++++-- cipd.bat | 2 +- cipd.ps1 | 6 +++++- cipd_bin_setup.bat | 2 +- cipd_bin_setup.sh | 4 +--- cipd_client_version | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat index 17844d2ff..d423ee58c 100644 --- a/bootstrap/win/win_tools.bat +++ b/bootstrap/win/win_tools.bat @@ -58,7 +58,7 @@ set WIN_TOOLS_EXTRA_ARGS=%WIN_TOOLS_EXTRA_ARGS% --win-tools-name "%WIN_TOOLS_NAM :: Install our CIPD packages. The CIPD client self-bootstraps. :: See "//cipd.bat" and "//cipd.ps1" for more information. set CIPD_EXE=%WIN_TOOLS_ROOT_DIR%\cipd.bat -call "%CIPD_EXE%" ensure -log-level warning -ensure-file "%~dp0%CIPD_MANIFEST%" -root "%WIN_TOOLS_PATH%" +call "%CIPD_EXE%" ensure -ensure-file "%~dp0%CIPD_MANIFEST%" -root "%WIN_TOOLS_PATH%" if errorlevel 1 goto :END :: This executes "win_tools.py" using the bundle's Python interpreter. diff --git a/cipd b/cipd index 5d9a5c4ad..fc8de1a9e 100755 --- a/cipd +++ b/cipd @@ -49,6 +49,8 @@ CLIENT="$MYPATH/.cipd_client" USER_AGENT="depot_tools/$(git -C $MYPATH rev-parse HEAD 2>/dev/null || echo "???")" if [ ! -e "$CLIENT" ]; then + echo "Bootstrapping cipd client for ${PLAT}-${ARCH}..." + echo "From $URL" if hash curl 2> /dev/null ; then # Download the client into a temporary file, then move it into the final # location atomically. @@ -58,7 +60,7 @@ if [ ! -e "$CLIENT" ]; then mktemp -p "$MYPATH" 2>/dev/null || \ mktemp "$MYPATH/.cipd_client.XXXXXXX") - curl "$URL" -s --show-error -f -A "$USER_AGENT" -L -o "$CIPD_CLIENT_TMP" + curl "$URL" -f -A "$USER_AGENT" -L -o "$CIPD_CLIENT_TMP" chmod +x "$CIPD_CLIENT_TMP" set +e @@ -76,7 +78,7 @@ if [ ! -e "$CLIENT" ]; then fi export CIPD_HTTP_USER_AGENT_PREFIX=$USER_AGENT -if ! "$CLIENT" selfupdate -log-level warning -version "$CIPD_CLIENT_VER" ; then +if ! "$CLIENT" selfupdate -version "$CIPD_CLIENT_VER" ; then echo -n "selfupdate failed: " 1>&2 echo "run \`CIPD_HTTP_USER_AGENT_PREFIX=$USER_AGENT/manual $CLIENT selfupdate -version '$CIPD_CLIENT_VER'\` to diagnose" 1>&2 echo "" 1>&2 diff --git a/cipd.bat b/cipd.bat index 5dda9e37e..019ac0156 100644 --- a/cipd.bat +++ b/cipd.bat @@ -18,7 +18,7 @@ if not exist "%~dp0.cipd_client.exe" ( ) for /f %%i in (%~dp0cipd_client_version) do set CIPD_CLIENT_VER=%%i -"%~dp0.cipd_client.exe" selfupdate -log-level warning -version "%CIPD_CLIENT_VER%" +"%~dp0.cipd_client.exe" selfupdate -version "%CIPD_CLIENT_VER%" if not errorlevel 0 goto :END "%~dp0.cipd_client.exe" %* diff --git a/cipd.ps1 b/cipd.ps1 index dfd718c0b..78efcd635 100644 --- a/cipd.ps1 +++ b/cipd.ps1 @@ -49,6 +49,9 @@ while ($true) { $cipd_lock_file = [IO.File]::OpenWrite($cipd_lock) if (!(Test-Path $client)) { + echo "Bootstrapping cipd client for $plat-$arch..." + echo "From $url" + # TODO(iannucci): It would be really nice if there was a way to get this to # show progress without also completely destroying the download speed, but # I can't seem to find a way to do it. Patches welcome :) @@ -58,10 +61,11 @@ while ($true) { } break } catch { + echo "CIPD lock is held, trying again after delay..." Start-Sleep -s 1 } finally { if ($cipd_lock_file) { $cipd_lock_file.close() } } -} +} \ No newline at end of file diff --git a/cipd_bin_setup.bat b/cipd_bin_setup.bat index 11350cdea..04c698c16 100644 --- a/cipd_bin_setup.bat +++ b/cipd_bin_setup.bat @@ -3,4 +3,4 @@ :: Use of this source code is governed by a BSD-style license that can be :: found in the LICENSE file. -"%~dp0\cipd.bat" ensure -log-level warning -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin" +"%~dp0\cipd.bat" ensure -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin" diff --git a/cipd_bin_setup.sh b/cipd_bin_setup.sh index aadf048dd..61dfb7af6 100644 --- a/cipd_bin_setup.sh +++ b/cipd_bin_setup.sh @@ -5,8 +5,6 @@ function cipd_bin_setup { local MYPATH=$(dirname "${BASH_SOURCE[0]}") - "$MYPATH/cipd" ensure \ - -log-level warning \ - -ensure-file "$MYPATH/cipd_manifest.txt" \ + "$MYPATH/cipd" ensure -ensure-file "$MYPATH/cipd_manifest.txt" \ -root "$MYPATH/.cipd_bin" } diff --git a/cipd_client_version b/cipd_client_version index e8312c5fa..97d68d497 100644 --- a/cipd_client_version +++ b/cipd_client_version @@ -1 +1 @@ -git_revision:e2a98b41adb3403b5b7771c4101b42a55dc2dd9e +git_revision:5cf65fdf804a9b3f3023f79d5b3cab2a88ccd09e