From b7420192ebf9b9c0299244bc581d2a7627a243a8 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 10 Apr 2014 13:57:16 +0100 Subject: [PATCH] Support different identity file structures Something to do with vagrant/paramiko versioning. --- fdroidserver/build.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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, -- 2.30.2