[Erp5-report] r17066 - in /erp5/trunk/products/ERP5Subversion: ./ Tool/
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Oct 21 00:08:00 CEST 2007
Author: yo
Date: Sun Oct 21 00:08:00 2007
New Revision: 17066
URL: http://svn.erp5.org?rev=17066&view=rev
Log:
use shutil.rmtree instead of removeAll.
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=17066&r1=17065&r2=17066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/SubversionClient.py (original)
+++ erp5/trunk/products/ERP5Subversion/SubversionClient.py Sun Oct 21 00:08:00 2007
@@ -36,7 +36,7 @@
from AccessControl import ClassSecurityInfo
from Products.PythonScripts.Utility import allow_class
from tempfile import mktemp
-from Products.ERP5.Document.BusinessTemplate import removeAll
+import shutil
class SubversionError(Exception):
"""The base exception class for the Subversion interface.
@@ -277,7 +277,7 @@
"""Remove all files and folders in list
"""
for file_path in path_list:
- removeAll(file_path)
+ shutil.rmtree(file_path)
def diff(self, path, revision1, revision2):
tmp = mktemp()
Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=17066&r1=17065&r2=17066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Sun Oct 21 00:08:00 2007
@@ -41,7 +41,7 @@
from App.config import getConfiguration
from tempfile import gettempdir, mktemp
from Products.CMFCore.utils import getToolByName
-from Products.ERP5.Document.BusinessTemplate import removeAll
+import shutil
from xml.sax.saxutils import escape
from dircache import listdir
from OFS.Traversable import NotFound
@@ -1058,7 +1058,7 @@
# Security hole fix
raise SubversionSecurityError, 'You are not allowed to delete these files'
for file_path in path_list:
- removeAll(self._getWorkingPath(file_path))
+ shutil.rmtree(self._getWorkingPath(file_path))
def getModifiedTree(self, business_template, show_unmodified=False) :
""" Return tree of files returned by svn status
@@ -1139,7 +1139,7 @@
except (pysvn.ClientError, NotFound, AttributeError, \
Error), error:
# Clean up
- removeAll(path)
+ shutil.rmtree(path)
raise error
# Clean up
self.activate().removeAllInList([path, ])
More information about the Erp5-report
mailing list