Validate the values of $merge_behavior #51
Merged
Conversation
This file contains 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
|
The dependency on stdlib isn't necessary. Instead of using unless $merge_behavior in ['native', 'deep', 'deeper'] {
fail("Invalid merge behavior: ${merge_behavior}")
} |
|
Thanks for the review, I rebased my PR |
| @@ -134,6 +134,10 @@ | |||
| ensure => directory, | |||
| } | |||
| } | |||
| if $merge_behavior { | |||
| unless $merge_behavior in ['native', 'deep', 'deeper'] { | |||
| fail("${merge_behavior} merge behavior is invalid. Valid values are: native, deep, deeper") | |||
| if $merge_behavior { | ||
| unless $merge_behavior in ['native', 'deep', 'deeper'] { | ||
| fail("${merge_behavior} merge behavior is invalid. Valid values are: native, deep, deeper") | ||
| } |
There was a problem hiding this comment.
now wondering if puppet optimizes this down to:
if $merge_behavior and !($merge_behavior in ['native', 'deep', 'deeper']) {:P
There was a problem hiding this comment.
Hah, good point. That might be a better way to specify that check.
hunner
added a commit
that referenced
this pull request
Mar 6, 2015
Validate the values of $merge_behavior
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 introduces dependency to puppetlabs/stdlib module