Merge pull request #86 from gjklein/master

Fix issue #85: PuttyMachine fails with non-default port.
tomerfiliba · Aug 24, 2013 · 47b9222 · 47b9222
2 parents 09489c8 + 61395d0
commit 47b9222
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plumbum/machines/ssh_machine.py b/plumbum/machines/ssh_machine.py
@@ -84,7 +84,7 @@ def __init__(self, host, user = None, port = None, keyfile = None, ssh_command =
         else:
             self._fqhost = host
         if port:
-            ssh_args.extend(["-p", str(port)])
+            ssh_args.extend(["-P" if 'plink.exe' in str(ssh_command) else "-p", str(port)])
             scp_args.extend(["-P", str(port)])
         if keyfile:
             ssh_args.extend(["-i", str(keyfile)])