Commit abce18cf authored by Stephen Levine's avatar Stephen Levine Committed by Brian May

Allow remote hosts with colons in the username

parent 5e904913
...@@ -63,7 +63,7 @@ def empackage(z, name, data=None): ...@@ -63,7 +63,7 @@ def empackage(z, name, data=None):
def connect(ssh_cmd, rhostport, python, stderr, options): def connect(ssh_cmd, rhostport, python, stderr, options):
portl = [] portl = []
if (rhostport or '').count(':') > 1: if re.sub(r'.*@', '', rhostport or '').count(':') > 1:
if rhostport.count(']') or rhostport.count('['): if rhostport.count(']') or rhostport.count('['):
result = rhostport.split(']') result = rhostport.split(']')
rhost = result[0].strip('[') rhost = result[0].strip('[')
...@@ -76,7 +76,7 @@ def connect(ssh_cmd, rhostport, python, stderr, options): ...@@ -76,7 +76,7 @@ def connect(ssh_cmd, rhostport, python, stderr, options):
else: else:
rhost = rhostport rhost = rhostport
else: # IPv4 else: # IPv4
l = (rhostport or '').split(':', 1) l = (rhostport or '').rsplit(':', 1)
rhost = l[0] rhost = l[0]
if len(l) > 1: if len(l) > 1:
portl = ['-p', str(int(l[1]))] portl = ['-p', str(int(l[1]))]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment