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

[nobody at svn.erp5.org]

Author: chris
Date: Thu Apr  6 16:26:29 2006
New Revision: 6486

URL: http://svn.erp5.org?rev=6486&view=rev
Log:
- cleanup

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=6486&r1=6485&r2=6486&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/SubversionClient.py (original)
+++ erp5/trunk/products/ERP5Subversion/SubversionClient.py Thu Apr  6 16:26:29 2006
@@ -113,7 +113,6 @@
       user, password = self.client.getLogin(realm)
       if not username or not password:
         self.client.setException(SubversionLoginError(realm))
-        #raise SubversionLoginError(realm)
         return False, '', '', False
       return True, user, password, False
   
@@ -124,13 +123,10 @@
   
   class SSLServerTrustPromptCallback(Callback):
     def __call__(self, trust_dict):
-      LOG('SubversionTool', WARNING, 'SSL Trust.')
       trust, permanent = self.client.trustSSLServer(trust_dict)
       if not trust:
-        LOG('SubversionTool', WARNING, 'No Trust.')
         self.client.setException(SubversionSSLTrustError(trust_dict))
         return False, 0, False
-      LOG('SubversionTool', WARNING, 'Has Trust.')
       # XXX SSL server certificate failure bits are not defined in pysvn.
       # 0x8 means that the CA is unknown.
       return True, 0x8, permanent

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=6486&r1=6485&r2=6486&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Thu Apr  6 16:26:29 2006
@@ -187,8 +187,8 @@
     # Getting modifications lines
     tmp = re.search('^@@ -\d+', self.header)
     self.old_line = tmp.string[tmp.start():tmp.end()][4:]
-    tmp = re.search('\+\d+,', self.header)
-    self.new_line = tmp.string[tmp.start():tmp.end()][1:-1]
+    tmp = re.search('\+\d+', self.header)
+    self.new_line = tmp.string[tmp.start():tmp.end()][1:]
     # Splitting modifications in SubCodeBlocks
     in_modif = False
     self.children = []
@@ -598,8 +598,6 @@
     svn_path += bt.getTitle()+'/'
     if path[-1]!='/':
       path+='/'
-    # update working copy from repository
-    self.update(svn_path)
     # svn del deleted files
     self.deleteOldFiles(svn_path, path)
     # add new files and copy