mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support different identity file structures

Browse source 
Something to do with vagrant/paramiko versioning.
This commit is contained in:
Ciaran Gultnieks 2014-04-10 13:57:16 +01:00
parent 8fdfc47f84
commit b7420192eb
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/build.py
View file

@ -160,7 +160,9 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
sshs = paramiko.SSHClient() sshs = paramiko.SSHClient()
sshs.set_missing_host_key_policy(paramiko.AutoAddPolicy()) sshs.set_missing_host_key_policy(paramiko.AutoAddPolicy())
idfile = sshconfig['identityfile'] idfile = sshconfig['identityfile']
if idfile.startswith('"') and idfile.endswith('"'): if isinstance(idfile, list):
idfile = idfile[0]
elif idfile.startswith('"') and idfile.endswith('"'):
idfile = idfile[1:-1] idfile = idfile[1:-1]
sshs.connect(sshconfig['hostname'], username=sshconfig['user'], sshs.connect(sshconfig['hostname'], username=sshconfig['user'],
port=int(sshconfig['port']), timeout=300, look_for_keys=False, port=int(sshconfig['port']), timeout=300, look_for_keys=False,