|
|
|
@ -44,16 +44,25 @@ class ActionModule(ActionBase):
|
|
|
|
|
|
|
|
|
|
return path
|
|
|
|
|
|
|
|
|
|
def _process_origin(self, host, path, user):
|
|
|
|
|
def _format_rsync_rsh_target(self, host, path, user):
|
|
|
|
|
''' formats rsync rsh target, escaping ipv6 addresses if needed '''
|
|
|
|
|
|
|
|
|
|
if host not in C.LOCALHOST:
|
|
|
|
|
userPart = ''
|
|
|
|
|
def _needs_ipv6_brackets(host):
|
|
|
|
|
return ':' in host
|
|
|
|
|
|
|
|
|
|
user_prefix = ''
|
|
|
|
|
if user:
|
|
|
|
|
userPart = '%s@' % (user, )
|
|
|
|
|
if ":" in host:
|
|
|
|
|
return '[%s%s]:%s' % (userPart, host, path)
|
|
|
|
|
user_prefix = '%s@' % (user, )
|
|
|
|
|
|
|
|
|
|
if _needs_ipv6_brackets(host):
|
|
|
|
|
return '[%s%s]:%s' % (user_prefix, host, path)
|
|
|
|
|
else:
|
|
|
|
|
return '%s%s:%s' % (userPart, host, path)
|
|
|
|
|
return '%s%s:%s' % (user_prefix, host, path)
|
|
|
|
|
|
|
|
|
|
def _process_origin(self, host, path, user):
|
|
|
|
|
|
|
|
|
|
if host not in C.LOCALHOST:
|
|
|
|
|
return self._format_rsync_rsh_target(host, path, user)
|
|
|
|
|
|
|
|
|
|
if ':' not in path and not path.startswith('/'):
|
|
|
|
|
path = self._get_absolute_path(path=path)
|
|
|
|
@ -62,13 +71,7 @@ class ActionModule(ActionBase):
|
|
|
|
|
def _process_remote(self, host, path, user):
|
|
|
|
|
transport = self._play_context.connection
|
|
|
|
|
if host not in C.LOCALHOST or transport != "local":
|
|
|
|
|
userPart = ''
|
|
|
|
|
if user:
|
|
|
|
|
userPart = '%s@' % (user, )
|
|
|
|
|
if ":" in host:
|
|
|
|
|
return '[%s%s]:%s' % (userPart, host, path)
|
|
|
|
|
else:
|
|
|
|
|
return '%s%s:%s' % (userPart, host, path)
|
|
|
|
|
return self._format_rsync_rsh_target(host, path, user)
|
|
|
|
|
|
|
|
|
|
if ':' not in path and not path.startswith('/'):
|
|
|
|
|
path = self._get_absolute_path(path=path)
|
|
|
|
|