Don't SFTP PUT directory contents twice #230
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #218 (put method generates "Failed SFTP MKDIR"), int128/gradle-ssh-plugin#285, and potentially #228.
When recursively gathering files to PUT, directory contents are apparently intended to be inspected separately depending on whether the child is a file or a dir:
File.eachFile
File.eachDir
but the
File.eachFile
invocation used includes both files and directories, thus resulting in directories being gathered twice.Steps to verify the fix
FilePut.put
method with afrom
argument indicating a directory tree multiple levels deepBackward compatibility
Other than eliminating redundant traversals, this fix changes the order of traversal: previously all items were traversed in lexicographical order, with directory-children interleaved with regular file-children (and then the directories were traversed a second time). Now, all file-children are traversed first, and then directory-children are traversed. This is what I gleaned to be the original intent of the code, based on the separate calls to
File.eachFile
andFile.eachDir
.