swarming-cipd: fix for Windows

client/utils/file_path.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Provides functions: get_native_path_case(), isabs() and safe_join().
 
 This module assumes that filesystem is not changing while current process
 is running and thus it caches results of functions that depend on FS state.
 """
 
@@ skipping 708 matching lines @@
 
 
 def set_read_only_swallow(path, read_only):
   """Returns if an OSError exception occured."""
   try:
     set_read_only(path, read_only)
   except OSError as e:
     return e
 
 
+def remove(filepath):
+  """Removes a file, even if it is read-only."""
+  # TODO(maruel): Not do it unless necessary since it slows this function
+  # down.
+  if sys.platform == 'win32':
+    # Deleting a read-only file will fail if it is read-only.
+    set_read_only(filepath, False)
+  else:
+    # Deleting a read-only file will fail if the directory is read-only.
+    set_read_only(os.path.dirname(filepath), False)
+  fs.remove(filepath)
+
+
 def try_remove(filepath):
   """Removes a file without crashing even if it doesn't exist."""
   try:
-    # TODO(maruel): Not do it unless necessary since it slows this function
-    # down.
-    if sys.platform == 'win32':
-      # Deleting a read-only file will fail if it is read-only.
-      set_read_only(filepath, False)
-    else:
-      # Deleting a read-only file will fail if the directory is read-only.
-      set_read_only(os.path.dirname(filepath), False)
-    fs.remove(filepath)
+    remove(filepath)
   except OSError:
     pass
 
 
 def link_file(outfile, infile, action):
   """Links a file. The type of link depends on |action|.
 
   Returns:
     True if the action was carried on, False if fallback was used.
   """
@@ skipping 276 matching lines @@
   errors = []
   fs.rmtree(root, onerror=lambda *args: errors.append(args))
   if errors:
     # There's no hope.
     sys.stderr.write(
         'Failed to delete %s. The following files remain:\n' % root)
     for _, path, _ in errors:
       sys.stderr.write('- %s\n' % path)
     raise errors[0][2][0], errors[0][2][1], errors[0][2][2]
   return False