From 06e2dcc10868b4a69fc05cb05012e48911fd2cdd Mon Sep 17 00:00:00 2001
From: Ryan Hartkopf <rhartkopf@appliedtrust.com>
Date: Mon, 4 May 2015 08:58:05 -0600
Subject: [PATCH] synchronize: don't add ssh_args to ssh_opts when false or
 null

---
 files/synchronize.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/files/synchronize.py b/files/synchronize.py
index f2dbf1b4961..2fb93e4cad3 100644
--- a/files/synchronize.py
+++ b/files/synchronize.py
@@ -316,7 +316,11 @@ def main():
     else:
         private_key = '-i '+ private_key 
 
-    ssh_opts = '-S none -o StrictHostKeyChecking=no %s' % ssh_args
+    if ssh_args:
+      ssh_opts = '-S none -o StrictHostKeyChecking=no %s' % ssh_args
+    else:
+      ssh_opts = '-S none -o StrictHostKeyChecking=no'
+
     if dest_port != 22:
         cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port)
     else: