Submodule now uses a specialized method to remove its trees to allow read-only files to be removed on windows as well

Byron · Byron · commit 9b6f38d02c8e · 2011-06-13T16:13:35.000+02:00
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
@@ -13,7 +13,8 @@
 						Iterable, 
 						join_path_native, 
 						to_native_path_linux,
-						RemoteProgress
+						RemoteProgress,
+						rmtree
 					)
 
 from git.config import SectionConstraint
@@ -29,8 +30,6 @@
 import sys
 import time
 
-import shutil
-
 __all__ = ["Submodule", "UpdateProgress"]
 
 
@@ -622,7 +621,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):
 				if os.path.islink(mp):
 					method = os.remove
 				elif os.path.isdir(mp):
-					method = shutil.rmtree
+					method = rmtree
 				elif os.path.exists(mp):
 					raise AssertionError("Cannot forcibly delete repository as it was neither a link, nor a directory")
 				#END handle brutal deletion
@@ -671,7 +670,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):
 				if not dry_run:
 					wtd = mod.working_tree_dir
 					del(mod)		# release file-handles (windows)
-					shutil.rmtree(wtd)
+					rmtree(wtd)
 				# END delete tree if possible
 			# END handle force
 		# END handle module deletion
diff --git a/git/util.py b/git/util.py
@@ -8,6 +8,8 @@
 import re
 import sys
 import time
+import stat
+import shutil
 import tempfile
 import platform
 
@@ -23,10 +25,26 @@
 __all__ = ( "stream_copy", "join_path", "to_native_path_windows", "to_native_path_linux", 
 			"join_path_native", "Stats", "IndexFileSHA1Writer", "Iterable", "IterableList", 
 			"BlockingLockFile", "LockFile", 'Actor', 'get_user_id', 'assure_directory_exists',
-			'RemoteProgress')
+			'RemoteProgress', 'rmtree')
 
 #{ Utility Methods
 
+def rmtree(path):
+	"""Remove the given recursively.
+	:note: we use shutil rmtree but adjust its behaviour to see whether files that
+		couldn't be deleted are read-only. Windows will not remove them in that case"""
+	def onerror(func, path, exc_info):
+		if not os.access(path, os.W_OK):
+			# Is the error an access error ?
+			os.chmod(path, stat.S_IWUSR)
+			func(path)
+		else:
+			raise
+	# END end onerror
+	return shutil.rmtree(path, False, onerror)
+
+	
+
 def stream_copy(source, destination, chunk_size=512*1024):
 	"""Copy all data from the source stream into the destination stream in chunks
 	of size chunk_size
