Make Lockfile._remove_lockfile more robust on win32

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 tempfile
+import time
 import subprocess
 import sys
 import urlparse
 
 from download_from_google_storage import Gsutil
 import gclient_utils
 import subcommand
 
 try:
   # pylint: disable=E0602
@@ skipping 29 matching lines @@
 
   def _make_lockfile(self):
     """Safely creates a lockfile containing the current pid."""
     open_flags = (os.O_CREAT | os.O_EXCL | os.O_WRONLY)
     fd = os.open(self.lockfile, open_flags, 0o644)
     f = os.fdopen(fd, 'w')
     print(self.pid, file=f)
     f.close()
 
   def _remove_lockfile(self):
-    """Delete the lockfile. Complains (implicitly) if it doesn't exist."""
-    os.remove(self.lockfile)
+    """Delete the lockfile. Complains (implicitly) if it doesn't exist.
+
+    See gclient_utils.py:rmtree docstring for more explanation on the
+    windows case.
+    """
+    if sys.platform == 'win32':
+      lockfile = os.path.normcase(self.lockfile)
+      for _ in xrange(3):
+        exitcode = subprocess.call(['cmd.exe', '/c',
+                                    'del', '/f', '/q', lockfile])
+        if exitcode == 0:
+          return
+        time.sleep(3)
+        raise LockError('Failed to remove lock: %s' % lockfile)

[Ryan Tseng, 2014/04/17 08:20:22]

I think you want to put this outside the for loop

+    else:
+      os.remove(self.lockfile)
 
   def lock(self):
     """Acquire the lock.
 
     Note: This is a NON-BLOCKING FAIL-FAST operation.
     Do. Or do not. There is no try.
     """
     try:
       self._make_lockfile()
     except OSError as e:
@@ skipping 415 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:]))