Added SafeRename to better handle problems with git processes locking directories.

gclient_utils.py

 # Copyright (c) 2012 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.
 
 """Generic utils."""
 
 import codecs
 import logging
 import os
 import pipes
@@ skipping 78 matching lines @@
       return s.decode('utf-8')
     except UnicodeDecodeError:
       return s
 
 
 def FileWrite(filename, content, mode='w'):
   with codecs.open(filename, mode=mode, encoding='utf-8') as f:
     f.write(content)
 
 
+def SafeRename(old, new):

[M-A Ruel, 2013/09/18 18:36:16]

Use safe_rename instead, we're slowly moving to non camelcase naming.

[karmann, 2013/09/20 03:35:30]

Done.

+  """

[M-A Ruel, 2013/09/18 18:36:16]

"""Renames a file reliably.

[karmann, 2013/09/20 03:35:30]

Done.

+  Renames a file reliably.
+
+  Sometimes os.rename does not work because a dying git process keeps a handle 
+  on it for a few seconds. An exception is then thrown, which make the program 
+  give up what it was doing and remove what was deleted.
+  The only solution is to catch the exception and try again until it works. 
+  """
+  count = 0

[M-A Ruel, 2013/09/18 18:36:16]

# Roughly 10s
retries = 100
for i in range(retries):
  try:
    os.rename(old, new)
    break
  except OSError:
    if i == (retries - 1):
      raise
    logging.debug(...
    time.sleep(0.1)

[karmann, 2013/09/20 03:35:30]

Done.

+  while 1:
+    count += 1
+    try:
+      os.rename(old, new)
+      logging.debug("Renamed %s in %s" % (old, new))
+      break
+    except OSError:
+      if count > 15:
+        # Give up.
+        raise
+      # retry
+      logging.debug("Renaming failed from %s to %s. Retrying ..." % (old, new))
+      time.sleep(1)
+
+
 def rmtree(path):
   """shutil.rmtree() on steroids.
 
   Recursively removes a directory, even if it's marked read-only.
 
   shutil.rmtree() doesn't work on Windows if any of the files or directories
   are read-only, which svn repositories and some .svn files are.  We need to
   be able to force the files to be writable (i.e., deletable) as we traverse
   the tree.
 
@@ skipping 768 matching lines @@
 
   Python on OSX 10.6 raises a NotImplementedError exception.
   """
   try:
     import multiprocessing
     return multiprocessing.cpu_count()
   except:  # pylint: disable=W0702
     # Mac OS 10.6 only
     # pylint: disable=E1101
     return int(os.sysconf('SC_NPROCESSORS_ONLN'))