Revert acceptance of directory as dest for copy

Although library/copy can be corrected to understand that dest is
a directory, I can't see how to let _execute_copy know this and let the
file module know.

As a better solution than before #733, the copy module now explicitly (rather
than silently) fails when dest is a directory.
This commit is contained in:
Will Thames 2012-08-02 16:02:15 +10:00
parent abc19c1e16
commit 8350029e25

2
copy
View file

@ -49,7 +49,7 @@ def main():
module.fail_json(msg="Destination %s not readable" % (dest)) module.fail_json(msg="Destination %s not readable" % (dest))
# Allow dest to be directory without compromising md5 check # Allow dest to be directory without compromising md5 check
if (os.path.isdir(dest)): if (os.path.isdir(dest)):
dest = os.join(dest, os.path.basename(src)) module.fail_json(msg="Destination %s cannot be a directory" % (dest))
md5sum_dest = module.md5(dest) md5sum_dest = module.md5(dest)
else: else:
if not os.access(os.path.dirname(dest), os.W_OK): if not os.access(os.path.dirname(dest), os.W_OK):