From 813000b2cc13653cdbb1ed5be79b3f14873d9d8a Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 5 Mar 2010 07:46:39 +0000 Subject: [PATCH] Reliable rmtree on Windows --- direct/src/p3d/DeploymentTools.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/direct/src/p3d/DeploymentTools.py b/direct/src/p3d/DeploymentTools.py index a76116b56d..5bdc26e2a9 100644 --- a/direct/src/p3d/DeploymentTools.py +++ b/direct/src/p3d/DeploymentTools.py @@ -348,7 +348,11 @@ class Installer: debfile.write(datatargz.str) if (len(datatargz.str) & 1): debfile.write("\x0A") debfile.close() - shutil.rmtree(tempdir.toOsSpecific()) + try: + base.appRunner.rmtree(tempdir) + except: + try: shutil.rmtree(tempdir.toOsSpecific()) + except: pass def buildAPP(self, output, platform): @@ -659,5 +663,9 @@ class Installer: os.system(cmd) nsifile.unlink() - shutil.rmtree(rootDir.toOsSpecific()) + try: + base.appRunner.rmtree(rootDir) + except: + try: shutil.rmtree(rootDir.toOsSpecific()) + except: pass return output