[Erp5-report] r40515 jm - in /erp5/trunk: bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Nov 23 11:00:43 CET 2010


Author: jm
Date: Tue Nov 23 11:00:42 2010
New Revision: 40515

URL: http://svn.erp5.org?rev=40515&view=rev
Log:
ERP5Subversion: fix regressions caused by r40395

Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
    erp5/trunk/bt5/erp5_forge/bt/revision
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml?rev=40515&r1=40514&r2=40515&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml [utf8] Tue Nov 23 11:00:42 2010
@@ -79,8 +79,9 @@ if changelog is None or not changelog.st
   error_msg = "Please set a ChangeLog message."\n
 else:\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
-    exclude_list = added.split(\',\') + modified.split(\',\') + removed.split(\',\'))\n
+                           exclude_list=filter(None, exclude_list))\n
   try:\n
     revision = portal_subversion.checkin(\'.\', business_template=context,\n
                                               log_message=changelog)\n
@@ -164,7 +165,9 @@ return context.asContext(added=added, mo
                             <string>error_msg</string>
                             <string>context</string>
                             <string>portal_subversion</string>
+                            <string>exclude_list</string>
                             <string>True</string>
+                            <string>filter</string>
                             <string>revision</string>
                             <string>e</string>
                             <string>dict</string>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=40515&r1=40514&r2=40515&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Tue Nov 23 11:00:42 2010
@@ -1 +1 @@
-630
\ No newline at end of file
+631
\ No newline at end of file

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=40515&r1=40514&r2=40515&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py [utf8] Tue Nov 23 11:00:42 2010
@@ -610,7 +610,7 @@ class SubversionTool(BaseTool):
     """
     client = self._getClient()
     if isinstance(path, basestring):
-      path = path,
+      path = [path]
     if business_template is not None:
       path = [self._getWorkingPath(self.relativeToAbsolute(x,
         business_template)) for x in path]




More information about the Erp5-report mailing list