Fix strict variables error when facts are missing #708
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
alexjfisher
force-pushed
the
fix_strict_vars
branch
from
e7737ea to
fa05ea5
Compare
alexjfisher
commented
Nov 5, 2017
| @@ -34,7 +34,7 @@ | |||
| $write_threads = $collectd::params::write_threads, | |||
| ) inherits collectd::params { | |||
|
|
|||
| $collectd_version_real = pick($::collectd_version, $minimum_version) | |||
| $collectd_version_real = pick_default($facts['collectd_version'], $minimum_version) | |||
There was a problem hiding this comment.
I'm not sure if minimum_version is allowed to be set to undef, but pick_default would allow this.
alexjfisher
commented
Nov 5, 2017
| @@ -135,5 +135,5 @@ | |||
| } | |||
|
|
|||
| # Override with custom fact value (present only if python is installed) | |||
| $python_dir = pick($::python_dir, $default_python_dir) | |||
| $python_dir = pick($facts['python_dir'], $default_python_dir) | |||
There was a problem hiding this comment.
default_python_dir is always set, so pick_default isn't needed/wanted here.
bastelfreak
approved these changes
Nov 6, 2017
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.
An alternative to #707