Fix: replacing shutils.rmtree with portable rmtree due to problem #34

Author: EYVSTM

portable.py

@@ -20,8 +20,15 @@ def isUnix():
 def to_windows_path(path):
   return path.replace('/', '\\')
 
-def rmtree(path):
-  shutil.rmtree(path, onerror=onerror)
+def rmtree(top):
+  for root, dirs, files in os.walk(top, topdown=False):
+    for name in files:
+      filename = os.path.join(root, name)
+      os.chmod(filename, stat.S_IWRITE)
+      os.remove(filename)
+    for name in dirs:
+      rmtree(os.path.join(root, name))
+  os.rmdir(top)
 
 def rename(src, dst):
   if isUnix():

project.py

@@ -2166,10 +2166,10 @@ def _InitGitDir(self, mirror_git=None, force_sync=False):
           if force_sync:
             print("Retrying clone after deleting %s" % self.gitdir, file=sys.stderr)
             try:
-              shutil.rmtree(os.path.realpath(self.gitdir))
+              portable.rmtree(os.path.realpath(self.gitdir))
               if self.worktree and os.path.exists(
                   os.path.realpath(self.worktree)):
-                shutil.rmtree(os.path.realpath(self.worktree))
+                portable.rmtree(os.path.realpath(self.worktree))
               return self._InitGitDir(mirror_git=mirror_git, force_sync=False)
             except:
               raise e
@@ -2210,9 +2210,9 @@ def _InitGitDir(self, mirror_git=None, force_sync=False):
           self.config.SetString('core.bare', None)
     except Exception:
       if init_obj_dir and os.path.exists(self.objdir):
-        shutil.rmtree(self.objdir)
+        portable.rmtree(self.objdir)
       if init_git_dir and os.path.exists(self.gitdir):
-        shutil.rmtree(self.gitdir)
+        portable.rmtree(self.gitdir)
       raise
 
   def _UpdateHooks(self):
@@ -2384,7 +2384,7 @@ def _InitWorkTree(self, force_sync=False):
       except GitError as e:
         if force_sync:
           try:
-            shutil.rmtree(dotgit)
+            portable.rmtree(dotgit)
             return self._InitWorkTree(force_sync=False)
           except:
             raise e
@@ -2402,7 +2402,7 @@ def _InitWorkTree(self, force_sync=False):
         self._CopyAndLinkFiles()
     except Exception:
       if init_dotgit:
-        # shutil.rmtree(dotgit)
+        # portable.rmtree(dotgit)
         portable.rmtree(dotgit)
       raise
 

subcmds/gitc_delete.py

@@ -52,4 +52,4 @@ def Execute(self, opt, args):
       if not response == 'yes':
         print('Response was not "yes"\n Exiting...')
         sys.exit(1)
-    shutil.rmtree(self.gitc_manifest.gitc_client_dir)
+    portable.rmtree(self.gitc_manifest.gitc_client_dir)

subcmds/init.py

@@ -229,7 +229,7 @@ def _SyncManifest(self, opt):
       # Better delete the manifest git dir if we created it; otherwise next
       # time (when user fixes problems) we won't go through the "is_new" logic.
       if is_new:
-        shutil.rmtree(m.gitdir)
+        portable.rmtree(m.gitdir)
       sys.exit(1)
 
     if opt.manifest_branch:

subcmds/sync.py

@@ -19,12 +19,14 @@
 from optparse import SUPPRESS_HELP
 import os
 import re
+import portable
 import shutil
 import socket
 import subprocess
 import sys
 import tempfile
 import time
+import stat
 
 from pyversion import is_python3
 if is_python3():
@@ -490,7 +492,7 @@ def UpdateProjectList(self):
             else:
               print('Deleting obsolete path %s' % project.worktree,
                     file=sys.stderr)
-              shutil.rmtree(project.worktree)
+              portable.rmtree(project.worktree)
               # Try deleting parent subdirs if they are empty
               project_dir = os.path.dirname(project.worktree)
               while project_dir != self.manifest.topdir: