Commit 5df48fa3 authored by Alexandre Boeglin's avatar Alexandre Boeglin

fixed typo that lead to python2.3 incompatibility


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10149 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a8df3911
...@@ -737,13 +737,13 @@ class SubversionTool(BaseTool, UniqueObject, Folder): ...@@ -737,13 +737,13 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
""" """
path = self._getWorkingPath(self.getSubversionPath(business_template)) path = self._getWorkingPath(self.getSubversionPath(business_template))
# First remove unversioned in working copy that could conflict # First remove unversioned in working copy that could conflict
self.removeAllInList(x['uid'] for x in self.unversionedFiles(path)) self.removeAllInList([x['uid'] for x in self.unversionedFiles(path)])
client = self._getClient() client = self._getClient()
# Revert local changes in working copy first # Revert local changes in working copy first
# to import a "pure" BT after update # to import a "pure" BT after update
self.revert(path=path, recurse=True) self.revert(path=path, recurse=True)
# removed unversioned files due to former added files that were reverted # removed unversioned files due to former added files that were reverted
self.removeAllInList(x['uid'] for x in self.unversionedFiles(path)) self.removeAllInList([x['uid'] for x in self.unversionedFiles(path)])
# Update from SVN # Update from SVN
client.update(path) client.update(path)
# Import in zodb # Import in zodb
...@@ -762,7 +762,7 @@ class SubversionTool(BaseTool, UniqueObject, Folder): ...@@ -762,7 +762,7 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
if os.path.exists(revision_path): if os.path.exists(revision_path):
self.revert(path=revision_path, recurse=False) self.revert(path=revision_path, recurse=False)
# remove unversioned files in working copy that could be annoying # remove unversioned files in working copy that could be annoying
self.removeAllInList(x['uid'] for x in self.unversionedFiles(path)) self.removeAllInList([x['uid'] for x in self.unversionedFiles(path)])
# Update from SVN # Update from SVN
client.update(path) client.update(path)
# Check if some files are conflicted to raise an exception # Check if some files are conflicted to raise an exception
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment