Guard against :absent provider.options in redhat (issue 115) #140
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
|
For what it's worth, I am not quite happy with having converted |
| @@ -181,7 +181,7 @@ def self.format_file(filename, providers) | |||
| props = {} | |||
|
|
|||
| # Map everything to a flat hash | |||
| props = (provider.options || {}) | |||
| props = provider.options if provider.options and provider.options != :absent | |||
There was a problem hiding this comment.
https://travis-ci.org/voxpupuli/puppet-network/jobs/115005624#L369
rubocop says: Use && instead of and.
There was a problem hiding this comment.
whoops, didn't see that among all the other errors for that build
| @@ -181,7 +181,7 @@ def self.format_file(filename, providers) | |||
| props = {} | |||
|
|
|||
| # Map everything to a flat hash | |||
There was a problem hiding this comment.
is the comment above still correct?
There was a problem hiding this comment.
I think so, yes, but it seems to refer to the block below the assignment to props. I'll just move it if that's the case
Sometimes provider.options ends up with the value of :absent, causing a failure. The debian provider (interfaces.rb) already guards against trying to manipulate :absent as a hash. Make the redhat provider also guard against this. This should fix issue 115.
igalic
added a commit
that referenced
this pull request
Mar 10, 2016
Guard against :absent provider.options in redhat (issue 115)
|
thank you @rski! |
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.
Sometimes
provider.optionsends up with the value of:absent, causinga failure. The debian provider (interfaces.rb) already guards against
trying to manipulate
:absentas a hash. Make the redhat provider alsoguard against this. This should fix issue 115.