Chromium Code Reviews| Index: recipe_modules/bot_update/resources/bot_update.py |
| diff --git a/recipe_modules/bot_update/resources/bot_update.py b/recipe_modules/bot_update/resources/bot_update.py |
| index 3211369667372e4ec45a6b52343120b69985a912..ea6ec9b9ceeeddcba973787b9dece31169d79b5a 100755 |
| --- a/recipe_modules/bot_update/resources/bot_update.py |
| +++ b/recipe_modules/bot_update/resources/bot_update.py |
| @@ -518,6 +518,11 @@ def git_checkout(solutions, revisions, shallow, refs, git_cache_dir): |
| refspec = '%s:%s' % (ref, ref.lstrip('+')) |
| git('fetch', 'origin', refspec, cwd=sln_dir) |
| + # Windows sometimes has trouble deleting files. |
| + # This can make git commands that rely on locks fail. |
| + if sys.platform.startswith('win'): |
| + call('gclient.bat', 'cleanup', '--break_repo_locks') |
|
ddoman1
2016/10/25 21:55:23
I am afraid that it may be a better choice to copy
agable
2016/10/28 16:55:34
I'm the one deprecating cleanup (which has always
katthomas
2016/10/28 23:40:29
Done.
|
| + |
| revision = get_target_revision(name, url, revisions) or 'HEAD' |
| force_revision(sln_dir, revision) |
| done = True |