Support different identity file structures

Something to do with vagrant/paramiko versioning.

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 1635352949e06ee37cdbe9dd3e18da27afe8569f..c65703c364047cf2462cba0e732dba878e0b7bd2 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -160,7 +160,9 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
         sshs = paramiko.SSHClient()
         sshs.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         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]
         sshs.connect(sshconfig['hostname'], username=sshconfig['user'],
             port=int(sshconfig['port']), timeout=300, look_for_keys=False,