Show More
@@ -964,7 +964,7 b" if os.name == 'nt':" | |||||
964 | '''Build argument list for ssh or Plink''' |
|
964 | '''Build argument list for ssh or Plink''' | |
965 | pflag = 'plink' in sshcmd.lower() and '-P' or '-p' |
|
965 | pflag = 'plink' in sshcmd.lower() and '-P' or '-p' | |
966 | args = user and ("%s@%s" % (user, host)) or host |
|
966 | args = user and ("%s@%s" % (user, host)) or host | |
967 |
return port and ("%s %s %s" |
|
967 | return port and ("%s %s %s" % (args, pflag, port)) or args | |
968 |
|
968 | |||
969 | def testpid(pid): |
|
969 | def testpid(pid): | |
970 | '''return False if pid dead, True if running or not known''' |
|
970 | '''return False if pid dead, True if running or not known''' | |
@@ -1111,7 +1111,7 b' else:' | |||||
1111 | def sshargs(sshcmd, host, user, port): |
|
1111 | def sshargs(sshcmd, host, user, port): | |
1112 | '''Build argument list for ssh''' |
|
1112 | '''Build argument list for ssh''' | |
1113 | args = user and ("%s@%s" % (user, host)) or host |
|
1113 | args = user and ("%s@%s" % (user, host)) or host | |
1114 |
return port and ("%s -p %s" |
|
1114 | return port and ("%s -p %s" % (args, port)) or args | |
1115 |
|
1115 | |||
1116 | def is_exec(f): |
|
1116 | def is_exec(f): | |
1117 | """check whether a file is executable""" |
|
1117 | """check whether a file is executable""" |
General Comments 0
You need to be logged in to leave comments.
Login now