Fix handling of symbolic links in RemoveDirectory. Attempt at fixing repeated...

scripts/common/chromium_utils.py

 # Copyright (c) 2010 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.
 
 """ Set of basic operations/utilities that are used by the build. """
 
 import copy
 import errno
 import fnmatch
 import math
@@ skipping 220 matching lines @@
   """
   file_path = os.path.join(*path)
   if not os.path.exists(file_path):
     return
 
   def RemoveWithRetry_win(rmfunc, path):
     os.chmod(path, stat.S_IWRITE)
     if win32_api_avail:
       win32api.SetFileAttributes(path, win32con.FILE_ATTRIBUTE_NORMAL)
     try:
-      return rmfunc(path)
+      if os.path.islink(path):
+        return os.remove(path)
+      else:
+        return rmfunc(path)
     except EnvironmentError, e:
       if e.errno != errno.EACCES:
         raise
       print 'Failed to delete %s: trying again' % repr(path)
       time.sleep(0.1)
       return rmfunc(path)
 
   def RemoveWithRetry_non_win(rmfunc, path):
     if os.path.islink(path):
       return os.remove(path)
@@ skipping 498 matching lines @@
     LogAndRemoveFiles('/dev/shm', kLogRegex)
   elif IsMac():
     nstempdir_path = '/usr/local/libexec/nstempdir'
     if os.path.exists(nstempdir_path):
       ns_temp_dir = GetCommandOutput([nstempdir_path]).strip()
       if ns_temp_dir:
         LogAndRemoveFiles(ns_temp_dir, kLogRegex)
   else:
     raise NotImplementedError(
         'Platform "%s" is not currently supported.' % sys.platform)