summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid James <davidjames@google.com>2015-11-09 17:54:49 -0800
committerDavid James <davidjames@chromium.org>2015-11-10 16:45:11 +0000
commita9f3514a0dda6ceb2120b0d69b8f1a40c3b4a375 (patch)
treeca82c821f879c5c284f2e7d9697479966a2c4347
parentdded91252000cddcde8d5e9a49da53ae41fab838 (diff)
downloadchromite-a9f3514a0dda6ceb2120b0d69b8f1a40c3b4a375.tar.gz
Fix cleanup function to be a bit more robust.
Example failure: https://uberchromegw/i/chromeos/builders/whirlwind%20paladin/builds/3673 TBR=akeshet BUG=chromium:55250 TEST=unit test Change-Id: I079b11ef90e05e23323010fd92e6527885adacbd Reviewed-on: https://chromium-review.googlesource.com/311783 Tested-by: David James <davidjames@chromium.org> Reviewed-by: Fang Deng <fdeng@chromium.org>
-rw-r--r--cbuildbot/commands.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cbuildbot/commands.py b/cbuildbot/commands.py
index a2bc1c9eb..520294490 100644
--- a/cbuildbot/commands.py
+++ b/cbuildbot/commands.py
@@ -186,7 +186,7 @@ def BuildRootGitCleanup(buildroot):
logging.warning('\n%s', result.error)
# If there's no repository corruption, just delete the index.
- corrupted = git.IsGitRepositoryCorrupted(cwd)
+ corrupted = git.IsGitRepositoryCorrupted(repo_git_store)
lock.write_lock()
logging.warning('Deleting %s because %s failed', cwd, result.cmd)
osutils.RmDir(cwd, ignore_missing=True)