dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throw ArgumentError when there's an invalid config file, and catch only that.

This commit is contained in:
Parker Moore 2013-07-12 11:56:22 +02:00
parent 456ac01890
commit a7efb86d5c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jekyll/configuration.rb
View File

@ -117,16 +117,16 @@ module Jekyll
# Returns this configuration, overridden by the values in the file
def read_config_file(file)
next_config = YAML.safe_load_file(file)
raise "Configuration file: (INVALID) #{file}".yellow if !next_config.is_a?(Hash)
raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) if !next_config.is_a?(Hash)
Jekyll.logger.info "Configuration file:", file
next_config
rescue SystemCallError
if @default_config_file
Jekyll::Logger.warn "Configuration file:", "none"
Jekyll.logger.warn "Configuration file:", "none"
{}
else
Jekyll::Logger.error "Fatal:", "The configuration file '#{file}' could not be found."
exit(1)
Jekyll.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
abort
end
end