From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 10 Apr 2014 12:57:16 +0000 (+0100)
Subject: Support different identity file structures
X-Git-Tag: 0.2~138
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b7420192ebf9b9c0299244bc581d2a7627a243a8;p=fdroidserver.git

Support different identity file structures

Something to do with vagrant/paramiko versioning.
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 16353529..c65703c3 100644
--- 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,