Fix for recursion traceback in copy with relative paths

This is a further fix for: https://github.com/ansible/ansible/issues/9092

when the relative path contains a subdirectory.  Like:

ansible localhost -m copy -a 'src=/etc/group dest=foo/bar/'
pull/18777/head
Toshio Kuratomi 10 years ago committed by Matt Clay
parent cce6cb8d7f
commit 3aba0d5272

@ -181,7 +181,7 @@ def main():
if original_basename and dest.endswith("/"): if original_basename and dest.endswith("/"):
dest = os.path.join(dest, original_basename) dest = os.path.join(dest, original_basename)
dirname = os.path.dirname(dest) dirname = os.path.dirname(dest)
if not os.path.exists(dirname) and '/' in dirname: if not os.path.exists(dirname) and os.path.isabs(dirname):
(pre_existing_dir, new_directory_list) = split_pre_existing_dir(dirname) (pre_existing_dir, new_directory_list) = split_pre_existing_dir(dirname)
os.makedirs(dirname) os.makedirs(dirname)
directory_args = module.load_file_common_arguments(module.params) directory_args = module.load_file_common_arguments(module.params)

Loading…
Cancel
Save