2
0
Эх сурвалжийг харах

Reliable rmtree on Windows

rdb 16 жил өмнө
parent
commit
813000b2cc

+ 10 - 2
direct/src/p3d/DeploymentTools.py

@@ -348,7 +348,11 @@ class Installer:
         debfile.write(datatargz.str)
         debfile.write(datatargz.str)
         if (len(datatargz.str) & 1): debfile.write("\x0A")
         if (len(datatargz.str) & 1): debfile.write("\x0A")
         debfile.close()
         debfile.close()
-        shutil.rmtree(tempdir.toOsSpecific())
+        try:
+            base.appRunner.rmtree(tempdir)
+        except:
+            try: shutil.rmtree(tempdir.toOsSpecific())
+            except: pass
 
 
     def buildAPP(self, output, platform):
     def buildAPP(self, output, platform):
         
         
@@ -659,5 +663,9 @@ class Installer:
         os.system(cmd)
         os.system(cmd)
 
 
         nsifile.unlink()
         nsifile.unlink()
-        shutil.rmtree(rootDir.toOsSpecific())
+        try:
+            base.appRunner.rmtree(rootDir)
+        except:
+            try: shutil.rmtree(rootDir.toOsSpecific())
+            except: pass
         return output
         return output