[Erp5-report] r7190 - in /erp5/trunk/products/ERP5Subversion: ./ Tool/

[nobody at svn.erp5.org]

Author: chris
Date: Thu May 11 12:51:07 2006
New Revision: 7190

URL: http://svn.erp5.org?rev=7190&view=rev
Log:
- removed forgotten os.system references
- do not duplicate removeAll() function anymore (take the one from BusinessTemplates)

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

Modified: erp5/trunk/products/ERP5Subversion/SubversionClient.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/SubversionClient.py?rev=7190&r1=7189&r2=7190&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/SubversionClient.py (original)
+++ erp5/trunk/products/ERP5Subversion/SubversionClient.py Thu May 11 12:51:07 2006
@@ -37,6 +37,7 @@
 from Products.ERP5Type import Permissions
 from Products.PythonScripts.Utility import allow_class
 from tempfile import mktemp
+from Products.ERP5.Document.BusinessTemplate import removeAll
 
 try:
   import pysvn
@@ -152,7 +153,6 @@
     klass.security.declareObjectPublic()
     for attr in klass.attribute_list:
       name = 'get' + convertToUpperCase(attr)
-      print name
       setattr(klass, name, Getter(attr))
       klass.security.declarePublic(name)
     InitializeClass(klass)
@@ -244,13 +244,13 @@
     
     def diff(self, path, revision1, revision2):
       tmp = mktemp()
-      os.system('mkdir -p %s'%tmp)
+      os.makedirs(tmp)
       if not revision1 or not revision2:
         diff = self.client.diff(tmp_path=tmp, url_or_path=path, recurse=False)
       else:
         diff = self.client.diff(tmp_path=tmp, url_or_path=path, recurse=False, revision1=pysvn.Revision(pysvn.opt_revision_kind.number,revision1), revision2=pysvn.Revision(pysvn.opt_revision_kind.number,revision2))
       # clean up temp dir
-      os.system('rm -rf %s'%tmp)
+      removeAll(tmp)
       return diff
     
     def revert(self, path, recurse=False):

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=7190&r1=7189&r2=7190&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Thu May 11 12:51:07 2006
@@ -46,6 +46,7 @@
 from shutil import copy
 from zLOG import LOG
 from Products.CMFCore.utils import getToolByName
+from Products.ERP5.Document.BusinessTemplate import removeAll
 
 
 try:
@@ -71,27 +72,6 @@
   """The base exception class when business template is unknown.
   """
   pass
-
-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
       
 def copytree(src, dst, symlinks=False):
     """Recursively copy a directory tree using copy().