Merge pull request #381 from chenull/scp_honour_ssh_arg

honour BW_SSH_ARGS for scp command
bundlewrap · Dec 20, 2017 · 7b99b91 · 7b99b91
2 parents 9e918c5 + 752d0ba
commit 7b99b91
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/bundlewrap/operations.py b/bundlewrap/operations.py
@@ -261,9 +261,13 @@ def upload(
         "scp",
         "-o",
         "StrictHostKeyChecking=no" if add_host_keys else "StrictHostKeyChecking=yes",
-        local_path,
-        "{}:{}".format(hostname, temp_filename),
     ]
+    extra_args = environ.get("BW_SSH_ARGS", "").strip()
+    if extra_args:
+        scp_command.extend(split(extra_args))
+    scp_command.append(local_path)
+    scp_command.append("{}:{}".format(hostname, temp_filename))
+
     scp_process = run_local(scp_command)
 
     if scp_process.return_code != 0: