Fix configuration file marking in deb#464
Open
valepakh wants to merge 4 commits into
Open
Conversation
Author
|
@rpalcolea could you please take a look at this? |
# Conflicts: # src/main/groovy/com/netflix/gradle/plugins/rpm/RpmPlugin.groovy
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fix for the #463
The
Directiveis not an enum, but a class so string coercion doesn't work hereAlso the test with
eachLinewas not properly testing it.First, the
fileTypewas not of a proper type, second,eachLineon a string with 1 line was not testing the second term.Proper test for the
CONFIGflag was added to theDebCopyActionso now it recognizes it even when it's combined with other flags.Combining flags is moved to the common code so it's possible to write
fileType CONFIG | NOREPLACEin the common configuration section and it will be picked by both rpm and deb.The test for the rpm is added but it's disabled for some reason so I left it as is, although I checked it locally.