Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

'config_file' option set to default if the given file is not correct

  • Loading branch information...
commit 8672f1f715e562528060ad467c0d9dcce17747c8 1 parent 6b5eceb
@bfontaine bfontaine authored
Showing with 2 additions and 0 deletions.
  1. +2 −0  lib/jekyll.rb
View
2  lib/jekyll.rb
@@ -120,6 +120,7 @@ def self.configuration(override)
# _config.yml may override default source location, but until
# then, we need to know where to look for _config.yml
source = override['source'] || Jekyll::DEFAULTS['source']
+
config_filename = override['config_file'] || Jekyll::DEFAULTS['config_file']
# Get configuration from <source>/<config_filename>
@@ -132,6 +133,7 @@ def self.configuration(override)
$stderr.puts "WARNING: Could not read configuration. " +
"Using defaults (and options)."
$stderr.puts "\t" + err.to_s
+ override.delete 'config_file' # bad config file, using default one
config = {}
end
Please sign in to comment.
Something went wrong with that request. Please try again.