Not ignore fullpath on tarfileset #254
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Really not a big ant user. Thanks for the PR! |
tcurdt
requested changes
Feb 25, 2017
| if (scanner.getIncludedFilesCount() != 1 || scanner.getIncludedDirsCount() != 0) { | ||
| //this isn't a single-file tarfileset, ignoring the fullpath | ||
| fullpath = ""; | ||
| } |
There was a problem hiding this comment.
This isn't obvious to me. The fullpath can only be set on single-file sets?
| @@ -86,7 +93,7 @@ public void produce( final DataConsumer pReceiver ) throws IOException { | |||
|
|
|||
| final InputStream inputStream = new FileInputStream(file); | |||
| try { | |||
| final String entryName = prefix + "/" + name; | |||
| final String entryName = (fullpath.equals("") ? prefix + "/" + name : fullpath); | |||
There was a problem hiding this comment.
Please use:
final String entryName = "".equals(fullpath) ? prefix + "/" + name : fullpath;
Codecov Report
@@ Coverage Diff @@
## master #254 +/- ##
=========================================
Coverage 67.13% 67.13%
- Complexity 0 85 +85
=========================================
Files 7 7
Lines 566 566
Branches 85 74 -11
=========================================
Hits 380 380
Misses 139 139
Partials 47 47Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 PR is trying to resolve #245, this take the fullpath attribute from the tarfileset and use it to define the entryName of the file, but only if the tarfileset is a single-file fileset.