[Erp5-report] r6791 - in /erp5/trunk/products/ERP5Subversion: ./ Tool/

[nobody at svn.erp5.org]

Author: chris
Date: Wed Apr 19 09:19:54 2006
New Revision: 6791

URL: http://svn.erp5.org?rev=6791&view=rev
Log:
- fixed copytree function (couldn't create directories)
- renamed working copy preferences

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=6791&r1=6790&r2=6791&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/SubversionClient.py (original)
+++ erp5/trunk/products/ERP5Subversion/SubversionClient.py Wed Apr 19 09:19:54 2006
@@ -207,7 +207,7 @@
       return self.aq_parent._getLogin(realm)
     
     def _getPreferences(self):
-      working_path = self.getPortalObject().portal_preferences.getPreference('subversion_working_copy')
+      working_path = self.getPortalObject().portal_preferences.getPreferredSubversionWorkingCopy()
       if not working_path :
         raise "Error: Please set Subversion working path in preferences"
       #self.svn_username = self.getPortalObject().portal_preferences.getPreference('preferred_subversion_user_name')

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=6791&r1=6790&r2=6791&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Wed Apr 19 09:19:54 2006
@@ -84,8 +84,6 @@
     it is false, the contents of the files pointed to by symbolic
     links are copied.
     """
-    if not os.path.exists(dst):
-      os.mkdir(dst)
     names = os.listdir(src)
     errors = []
     for name in names:
@@ -96,6 +94,8 @@
                 linkto = os.readlink(srcname)
                 os.symlink(linkto, dstname)
             elif os.path.isdir(srcname):
+                if not os.path.exists(dstname):
+                  os.makedirs(dstname)
                 copytree(srcname, dstname, symlinks)
             else:
                 copy(srcname, dstname)
@@ -448,7 +448,7 @@
     # if file have been deleted then not in zodb
     if not os.path.exists(path):
       return '#'
-    svn_path = bt.getPortalObject().portal_preferences.getPreference('subversion_working_copy')
+    svn_path = bt.getPortalObject().portal_preferences.getPreferredSubversionWorkingCopy()
     if not svn_path:
       raise 'Error: Please set working copy path in Subversion preferences !'
     svn_path = os.path.join(svn_path, bt.getTitle())
@@ -606,7 +606,7 @@
   def info(self):
     """return info of working copy
     """
-    working_copy = self.getPortalObject().portal_preferences.getPreference('subversion_working_copy')
+    working_copy = self.getPortalObject().portal_preferences.getPreferredSubversionWorkingCopy()
     if not working_copy :
       raise 'Please set Working copy path in preferences'
     client = self._getClient()
@@ -623,7 +623,7 @@
   def cleanup(self):
     """remove svn locks in working copy
     """
-    working_copy = self.getPortalObject().portal_preferences.getPreference('subversion_working_copy')
+    working_copy = self.getPortalObject().portal_preferences.getPreferredSubversionWorkingCopy()
     if not working_copy :
       raise 'Please set Working copy path in preferences'
     client = self._getClient()
@@ -680,7 +680,7 @@
   
   def getModifiedTree(self, path) :
     # Remove trailing slash if it's present
-    if path[-1]== os.sep :
+    if path[-1] == os.sep :
       path = path[:-1]
     
     root = Dir(path, "normal")
@@ -724,7 +724,7 @@
   def extractBT(self, bt):
     path = mktemp()
     bt.export(path=path, local=1)
-    svn_path = self.getPortalObject().portal_preferences.getPreference('subversion_working_copy')
+    svn_path = self.getPortalObject().portal_preferences.getPreferredSubversionWorkingCopy()
     if not svn_path :
       raise "Error: Please set Subversion working path in preferences"
     svn_path=os.path.join(svn_path,bt.getTitle())+os.sep
@@ -792,7 +792,7 @@
   
   def _treeToXML(self, item, output, ident, first) :
     # svn path
-    svn_path = self.getPortalObject().portal_preferences.getPreference('subversion_working_copy')
+    svn_path = self.getPortalObject().portal_preferences.getPreferredSubversionWorkingCopy()
     if not svn_path :
       raise "Error: Please set Subversion working path in preferences"
     if svn_path[-1] != os.sep: