From cc11b065c54bae31b125f8ee0431cf9a08b1fe4f Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Wed, 4 Dec 2019 22:37:14 +0000 Subject: [PATCH] Revert "[bot_update] Also bootstrap in the case that there are 0 pack files" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 32a801b5dadfd40ef7999339559413408555ebdc. Reason for revert: It's causing depot tools presubmit to time out (Also, introduces a Python 3 error for git_cache). Original change's description: > [bot_update] Also bootstrap in the case that there are 0 pack files > > This can happen if the cache repo was init'd, but has no pack files; > previously it would try to fetch from scratch. > > R=​ehmaldonado@chromium.org, tandrii@chromium.org > > No-Presubmit: true > Change-Id: I97e863dd6c2ecfd00fdb4238dda48e0d3929c4f2 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1941337 > Commit-Queue: Robbie Iannucci > Reviewed-by: Andrii Shyshkalov TBR=iannucci@chromium.org,tandrii@google.com,ehmaldonado@chromium.org Change-Id: I93366bcc6ff1df579a67d51c2cda812c84a06215 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1951985 Reviewed-by: Edward Lesmes Commit-Queue: Edward Lesmes --- git_cache.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/git_cache.py b/git_cache.py index 1782ec093..c5f166e71 100755 --- a/git_cache.py +++ b/git_cache.py @@ -486,12 +486,11 @@ class Mirror(object): pack_files = [] if os.path.isdir(pack_dir): pack_files = [f for f in os.listdir(pack_dir) if f.endswith('.pack')] - self.print('%s has %d .pack files, re-bootstrapping if ==0 or >%d' % + self.print('%s has %d .pack files, re-bootstrapping if >%d' % (self.mirror_path, len(pack_files), GC_AUTOPACKLIMIT)) should_bootstrap = (force or not self.exists() or - len(pack_files) == 0 or len(pack_files) > GC_AUTOPACKLIMIT) if not should_bootstrap: