Commit edb97c7c authored by Julien Muchembled's avatar Julien Muchembled

ERP5Subversion: fix regressions caused by r40395

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40515 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fc5c2666
...@@ -79,8 +79,9 @@ if changelog is None or not changelog.strip():\n ...@@ -79,8 +79,9 @@ if changelog is None or not changelog.strip():\n
error_msg = "Please set a ChangeLog message."\n error_msg = "Please set a ChangeLog message."\n
else:\n else:\n
portal_subversion = context.getPortalObject().portal_subversion\n portal_subversion = context.getPortalObject().portal_subversion\n
exclude_list = added.split(\',\') + modified.split(\',\') + removed.split(\',\')\n
portal_subversion.revert(\'.\', business_template=context, recurse=True,\n portal_subversion.revert(\'.\', business_template=context, recurse=True,\n
exclude_list = added.split(\',\') + modified.split(\',\') + removed.split(\',\'))\n exclude_list=filter(None, exclude_list))\n
try:\n try:\n
revision = portal_subversion.checkin(\'.\', business_template=context,\n revision = portal_subversion.checkin(\'.\', business_template=context,\n
log_message=changelog)\n log_message=changelog)\n
...@@ -164,7 +165,9 @@ return context.asContext(added=added, modified=modified, removed=removed,\n ...@@ -164,7 +165,9 @@ return context.asContext(added=added, modified=modified, removed=removed,\n
<string>error_msg</string> <string>error_msg</string>
<string>context</string> <string>context</string>
<string>portal_subversion</string> <string>portal_subversion</string>
<string>exclude_list</string>
<string>True</string> <string>True</string>
<string>filter</string>
<string>revision</string> <string>revision</string>
<string>e</string> <string>e</string>
<string>dict</string> <string>dict</string>
......
630 631
\ No newline at end of file \ No newline at end of file
...@@ -610,7 +610,7 @@ class SubversionTool(BaseTool): ...@@ -610,7 +610,7 @@ class SubversionTool(BaseTool):
""" """
client = self._getClient() client = self._getClient()
if isinstance(path, basestring): if isinstance(path, basestring):
path = path, path = [path]
if business_template is not None: if business_template is not None:
path = [self._getWorkingPath(self.relativeToAbsolute(x, path = [self._getWorkingPath(self.relativeToAbsolute(x,
business_template)) for x in path] business_template)) for x in path]
......
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