From 1b30125fbc42e1a3c2c89c26eee813384f42d22c Mon Sep 17 00:00:00 2001 From: Andrii Shyshkalov Date: Mon, 27 Nov 2017 11:53:54 -0800 Subject: [PATCH] bot_update: don't remove git cache's .lock files. bot_update and gclient invokes git cache with --ignore-locks. This should also reduce noisiness of bot_update stdout. R=iannucci@chromium.org Bug: Change-Id: I6baf9e5665d244d08aab58a7d3327e6c3204b2b5 Reviewed-on: https://chromium-review.googlesource.com/791536 Reviewed-by: Ryan Tseng Commit-Queue: Andrii Shyshkalov --- recipes/recipe_modules/bot_update/resources/bot_update.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 537bdc36e..cd697575a 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -575,14 +575,6 @@ def _maybe_break_locks(checkout_path, tries=3): def git_checkouts(solutions, revisions, shallow, refs, git_cache_dir, cleanup_dir): build_dir = os.getcwd() - # Before we do anything, break all git_cache locks. - if path.isdir(git_cache_dir): - git('cache', 'unlock', '-vv', '--force', '--all', - '--cache-dir', git_cache_dir) - for item in os.listdir(git_cache_dir): - filename = os.path.join(git_cache_dir, item) - if item.endswith('.lock'): - raise Exception('%s exists after cache unlock' % filename) first_solution = True for sln in solutions: sln_dir = path.join(build_dir, sln['name'])