[Erp5-report] r6574 - /erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

[nobody at svn.erp5.org]

Author: chris
Date: Thu Apr 13 11:26:12 2006
New Revision: 6574

URL: http://svn.erp5.org?rev=6574&view=rev
Log:
- Started removal of system commands (rm, diff..)

Modified:
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=6574&r1=6573&r2=6574&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Thu Apr 13 11:26:12 2006
@@ -47,6 +47,28 @@
   from base64 import b64encode, b64decode
 except ImportError:
   from base64 import encodestring as b64encode, decodestring as b64decode
+  
+def removeAll(entry):
+  '''
+    Remove all files and directories under 'entry'.
+    XXX: This is defined here, because os.removedirs() is buggy.
+  '''
+  try:
+    if os.path.isdir(entry) and not os.path.islink(entry):
+      pwd = os.getcwd()
+      os.chmod(entry, 0755)
+      os.chdir(entry)
+      for e in os.listdir(os.curdir):
+        removeAll(e)
+      os.chdir(pwd)
+      os.rmdir(entry)
+    else:
+      if not os.path.islink(entry):
+        os.chmod(entry, 0644)
+      os.remove(entry)
+  except OSError:
+    pass
+
   
 class File :
   # Constructor
@@ -665,7 +687,6 @@
   
   def extractBT(self, bt):
     path = mktemp()
-    #os.system('rm -rf %s'%path)
     bt.export(path=path, local=1)
     svn_path = self.getPortalObject().portal_preferences.getPreference('subversion_working_copy')
     if not svn_path :
@@ -680,7 +701,7 @@
     # add new files and copy
     self.addNewFiles(svn_path, path)
     # Clean up
-    os.system('rm -rf %s'%path)
+    removeAll(path)
   
   # svn del files that have been removed in new dir
   def deleteOldFiles(self, old_dir, new_dir):