Merge pull request #11732 from amenonsen/9212-rebase

Forbid copy: content="" with a directory destination
pull/9432/merge
James Cammarata 9 years ago
commit eca88d4253

@ -49,6 +49,8 @@ class ActionModule(ActionBase):
return dict(failed=True, msg="src (or content) and dest are required") return dict(failed=True, msg="src (or content) and dest are required")
elif (source is not None or faf is not None) and content is not None: elif (source is not None or faf is not None) and content is not None:
return dict(failed=True, msg="src and content are mutually exclusive") return dict(failed=True, msg="src and content are mutually exclusive")
elif content is not None and dest is not None and dest.endswith("/"):
return dict(failed=True, msg="dest must be a file if content is defined")
# Check if the source ends with a "/" # Check if the source ends with a "/"
source_trailing_slash = False source_trailing_slash = False

Loading…
Cancel
Save