Try to load _config.yaml if _config.yml is nonexistent. #2406
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
| Jekyll.logger.warn "Configuration file:", "none" | ||
| {} | ||
| if file.end_with?('yml') | ||
| read_config_file(file.sub(/yml$/, 'yaml')) |
There was a problem hiding this comment.
Shouldn't we just do a check for existence instead of doing this? I'd rather do this above, on line 126.
There was a problem hiding this comment.
Thought that it would be nice if all the logic dealing with file existence and the like in one method.
Anyway, if we do the checking on line 126, I assume the default when both _config.yml and _config.yaml exist is still _config.yml, and let read_config_file takes care of the warning message?
There was a problem hiding this comment.
I'd say if they both exist, then yes, _config.yml should take precedence.
|
Sweet, LGTM. |
parkr
added a commit
that referenced
this pull request
May 20, 2014
parkr
added a commit
that referenced
this pull request
May 20, 2014
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 #2375.