Index: gclient.py |
diff --git a/gclient.py b/gclient.py |
index fb9775945bc53aacc13eaf89d35bf0c31e6271f1..bb62b2ba5dc171d39b04d3026aa539323cbd74f9 100755 |
--- a/gclient.py |
+++ b/gclient.py |
@@ -1221,6 +1221,9 @@ want to set 'managed': False in .gclient. |
if cache_dir: |
cache_dir = os.path.join(self.root_dir, cache_dir) |
cache_dir = os.path.abspath(cache_dir) |
+ # If running on a bot, force break any stale git cache locks. |
+ if os.environ.get('CHROME_HEADLESS'): |
+ subprocess2.check_call(['git', 'cache', 'unlock', '--force', '--all']) |
gclient_scm.GitWrapper.cache_dir = cache_dir |
git_cache.Mirror.SetCachePath(cache_dir) |