Make git cache delete a defunct directory instead of moving it

git_cache.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A git command for managing a local cache of git repositories."""
 
 from __future__ import print_function
 import errno
 import logging
 import optparse
 import os
 import re
 import tempfile
 import threading
 import time
-import shutil
 import subprocess
 import sys
 import urlparse
 import zipfile
 
 from download_from_google_storage import Gsutil
 import gclient_utils
 import subcommand
 
 # Analogous to gc.autopacklimit git config.
@@ skipping 309 matching lines @@
 
     should_bootstrap = (force or
                         not os.path.exists(config_file) or
                         len(pack_files) > GC_AUTOPACKLIMIT)
     if should_bootstrap:
       tempdir = tempfile.mkdtemp(
           prefix='_cache_tmp', suffix=self.basedir, dir=self.GetCachePath())
       bootstrapped = not depth and bootstrap and self.bootstrap_repo(tempdir)
       if bootstrapped:
         # Bootstrap succeeded; delete previous cache, if any.
-        try:
-          # Try to move folder to tempdir if possible.
-          defunct_dir = tempfile.mkdtemp()
-          shutil.move(self.mirror_path, defunct_dir)
-          self.print('Moved defunct directory for repository %s from %s to %s'
-                     % (self.url, self.mirror_path, defunct_dir))
-        except Exception:
-          gclient_utils.rmtree(self.mirror_path)
+        gclient_utils.rmtree(self.mirror_path)
       elif not os.path.exists(config_file):
         # Bootstrap failed, no previous cache; start with a bare git dir.
         self.RunGit(['init', '--bare'], cwd=tempdir)
       else:
         # Bootstrap failed, previous cache exists; warn and continue.
         logging.warn(
             'Git cache has a lot of pack files (%d).  Tried to re-bootstrap '
             'but failed.  Continuing with non-optimized repository.'
             % len(pack_files))
         gclient_utils.rmtree(tempdir)
@@ skipping 327 matching lines @@
     return options, args
 
 
 def main(argv):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParser(), argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))