Clean up temporary git pack files when breaking locks.

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
@@ skipping 343 matching lines @@
     # Creating a temp file and then deleting it ensures we can use this name.
     _, tmp_zipfile = tempfile.mkstemp(suffix='.zip')
     os.remove(tmp_zipfile)
     subprocess.call(['zip', '-r', tmp_zipfile, '.'], cwd=self.mirror_path)
     gsutil = Gsutil(path=self.gsutil_exe, boto_path=None)
     dest_name = 'gs://%s/%s/%s.zip' % (
         self.bootstrap_bucket, self.basedir, gen_number)
     gsutil.call('cp', tmp_zipfile, dest_name)
     os.remove(tmp_zipfile)
 
+  @staticmethod
+  def DeleteTmpPackFiles(path):
+    pack_dir = os.path.join(path, 'objects', 'pack')
+    pack_files = [f for f in os.listdir(pack_dir) if
+                  f.startswith('.tmp-') or f.startswith('tmp_pack_')]

[iannucci, 2014/06/10 23:09:08]

since the name of the file is <hex>.{idx,pack}, why not just `if 'tmp' in f`?

[szager1, 2014/06/10 23:38:27]

Hmm...  Maybe.  I'm a bit paranoid.

+    for f in pack_files:
+      f = os.path.join(pack_dir, f)
+      try:
+        os.remove(f)
+        logging.warn('Deleted stale temporary pack file %s' % f)
+      except OSError:
+        logging.warn('Unable to delete temporary pack file %s' % f)
 
   @staticmethod
   def BreakLocks(path):
     did_unlock = False
     lf = Lockfile(path)
     if lf.break_lock():
       did_unlock = True
     # Look for lock files that might have been left behind by an interrupted
     # git process.
     lf = os.path.join(path, 'config.lock')
@@ skipping 153 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:]))