[Erp5-report] r41577 kazuhiko - /erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Dec 21 11:52:11 2010
New Revision: 41577

URL: http://svn.erp5.org?rev=41577&view=rev
Log:
use '<instance_home>/bt5' as the default location of subversion workcopy path, that is the default location of erp5.recipe.zope2instance recipe.

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

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=41577&r1=41576&r2=41577&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py [utf8] Tue Dec 21 11:52:11 2010
@@ -36,6 +36,8 @@ from Products.ERP5Type import Permission
 from Products.ERP5Subversion import _dtmldir
 from Products.ERP5Type.DiffUtils import DiffFile
 from Products.ERP5Subversion.SubversionClient import newSubversionClient
+from zLOG import LOG, WARNING
+from App.config import getConfiguration
 import os, re
 from DateTime import DateTime
 from cPickle import dumps, loads
@@ -422,8 +424,11 @@ class SubversionTool(BaseTool):
     wc_list = self.getPortalObject().portal_preferences\
     .getPreferredSubversionWorkingCopyList()
     if not wc_list or len(wc_list) == 0 :
-      raise SubversionPreferencesError, \
-      'Please set at least one Subversion Working Copy in preferences first.'
+      LOG('SubvertionTool', WARNING,
+          'working copy path is not specified in preferences. '
+          '<instance_home>/bt5 directory is used by default.')
+      instance_home = getConfiguration().instancehome
+      wc_list = [os.path.join(instance_home, 'bt5'),]
     bt_name = business_template.getTitle()
     join = os.path.join
     isdir = os.path.isdir