1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-13 02:30:11 +01:00

Don't try and parse username/password out of repo address except for svn

This commit is contained in:
Ciaran Gultnieks 2013-10-02 10:25:26 +01:00
parent 381bbb60ac
commit 8f8360fcf6

View File

@ -53,19 +53,18 @@ class vcs:
self.sdk_path = sdk_path
# It's possible to sneak a username and password in with
# the remote address... (this really only applies to svn
# and we should probably be more specific!)
index = remote.find('@')
if index != -1:
self.username = remote[:index]
remote = remote[index+1:]
index = self.username.find(':')
if index == -1:
raise VCSException("Password required with username")
self.password = self.username[index+1:]
self.username = self.username[:index]
else:
self.username = None
# the remote address for svn...
self.username = None
if self.repotype() == 'svn':
index = remote.find('@')
if index != -1:
self.username = remote[:index]
remote = remote[index+1:]
index = self.username.find(':')
if index == -1:
raise VCSException("Password required with username")
self.password = self.username[index+1:]
self.username = self.username[:index]
self.remote = remote
self.local = local