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

Fixed merge with new log output in lib/jekyll.rb

This commit is contained in:
Parker Moore 2013-02-20 23:10:42 +01:00
parent 9eb79ff135
commit 5d8e012899
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/jekyll.rb
View File

@ -133,16 +133,17 @@ module Jekyll
config_file = File.join(source, '_config.yml') config_file = File.join(source, '_config.yml')
begin begin
config = YAML.safe_load_file(config_file) config = YAML.safe_load_file(config_file)
raise "Invalid configuration file: #{config_file}" if !config.is_a?(Hash) raise "Configuration file: (INVALID) #{config_file}" if !config.is_a?(Hash)
$stdout.puts "Configuration file: #{config_file}" $stdout.puts "Configuration file: #{config_file}"
rescue SystemCallError
# Errno:ENOENT = file not found
$stderr.puts "Configuration file: none"
config = {}
rescue => err rescue => err
unless File.exists?(config_file) $stderr.puts " " +
$stdout.puts "Configuration file: none" "WARNING: Error reading configuration. " +
else "Using defaults (and options)."
$stderr.puts "WARNING: Could not read configuration. " + $stderr.puts "#{err}"
"Using defaults (and options)."
$stderr.puts "\t" + err.to_s
end
config = {} config = {}
end end