(MODULES-8193) - Removal of inbuilt deepmerge and dirname functions#1145
Merged
tphoney merged 2 commits intopuppetlabs:masterfrom Dec 13, 2018
david22swan:MODULES-8193
Merged
(MODULES-8193) - Removal of inbuilt deepmerge and dirname functions#1145tphoney merged 2 commits intopuppetlabs:masterfrom david22swan:MODULES-8193
tphoney merged 2 commits intopuppetlabs:masterfrom
david22swan:MODULES-8193
Conversation
Both functions have been removed from the code and their function calls within the manifest's updated as they already exist within puppet itself, in the case of deepmerge and within stdlib in the case of dirname.
tphoney
reviewed
Dec 7, 2018
| if $configparentdir != '/' and $configparentdir != '/etc' and $configparentdir | ||
| != $includedir and $configparentdir != mysql::dirname($includedir) { | ||
| != $includedir and $includedir != undef and $includedir != '' and $configparentdir | ||
| != dirname($includedir) { |
Contributor
There was a problem hiding this comment.
this is hideously hard to read. can it be simplified or split up
Member
Author
|
Have separated/updated code in such as way as to improve readability while maintaining the original functionality of the code. |
Removed a test file that was missed by my first sweep Updated if statement to account for differences between the now removed built in dirname function and the stdlib version
Member
Author
|
@tphoney Are you fine with the code as it is now? |
Member
Author
|
Changes run green on adhoc |
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
2 participants
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.
Both functions have been removed from the code and their function calls within the manifest's updated as they already exist within puppet itself, in the case of deepmerge and within stdlib in the case of dirname.