Commit 361815ce authored by Christophe Dumez's avatar Christophe Dumez

- cleanup


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6486 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2b595079
...@@ -113,7 +113,6 @@ try: ...@@ -113,7 +113,6 @@ try:
user, password = self.client.getLogin(realm) user, password = self.client.getLogin(realm)
if not username or not password: if not username or not password:
self.client.setException(SubversionLoginError(realm)) self.client.setException(SubversionLoginError(realm))
#raise SubversionLoginError(realm)
return False, '', '', False return False, '', '', False
return True, user, password, False return True, user, password, False
...@@ -124,13 +123,10 @@ try: ...@@ -124,13 +123,10 @@ try:
class SSLServerTrustPromptCallback(Callback): class SSLServerTrustPromptCallback(Callback):
def __call__(self, trust_dict): def __call__(self, trust_dict):
LOG('SubversionTool', WARNING, 'SSL Trust.')
trust, permanent = self.client.trustSSLServer(trust_dict) trust, permanent = self.client.trustSSLServer(trust_dict)
if not trust: if not trust:
LOG('SubversionTool', WARNING, 'No Trust.')
self.client.setException(SubversionSSLTrustError(trust_dict)) self.client.setException(SubversionSSLTrustError(trust_dict))
return False, 0, False return False, 0, False
LOG('SubversionTool', WARNING, 'Has Trust.')
# XXX SSL server certificate failure bits are not defined in pysvn. # XXX SSL server certificate failure bits are not defined in pysvn.
# 0x8 means that the CA is unknown. # 0x8 means that the CA is unknown.
return True, 0x8, permanent return True, 0x8, permanent
......
...@@ -187,8 +187,8 @@ class CodeBlock: ...@@ -187,8 +187,8 @@ class CodeBlock:
# Getting modifications lines # Getting modifications lines
tmp = re.search('^@@ -\d+', self.header) tmp = re.search('^@@ -\d+', self.header)
self.old_line = tmp.string[tmp.start():tmp.end()][4:] self.old_line = tmp.string[tmp.start():tmp.end()][4:]
tmp = re.search('\+\d+,', self.header) tmp = re.search('\+\d+', self.header)
self.new_line = tmp.string[tmp.start():tmp.end()][1:-1] self.new_line = tmp.string[tmp.start():tmp.end()][1:]
# Splitting modifications in SubCodeBlocks # Splitting modifications in SubCodeBlocks
in_modif = False in_modif = False
self.children = [] self.children = []
...@@ -598,8 +598,6 @@ class SubversionTool(UniqueObject, Folder): ...@@ -598,8 +598,6 @@ class SubversionTool(UniqueObject, Folder):
svn_path += bt.getTitle()+'/' svn_path += bt.getTitle()+'/'
if path[-1]!='/': if path[-1]!='/':
path+='/' path+='/'
# update working copy from repository
self.update(svn_path)
# svn del deleted files # svn del deleted files
self.deleteOldFiles(svn_path, path) self.deleteOldFiles(svn_path, path)
# add new files and copy # add new files and copy
......
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