From 011c9fa9b0bcfdcb98fe22af90d1997b95e831f3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 17 Jul 2017 10:34:43 -0400 Subject: [PATCH 1/2] Reader#read_directories: guard against an entry not being a directory --- lib/jekyll/reader.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb index cdd45ab0f74..5f778fba61a 100644 --- a/lib/jekyll/reader.rb +++ b/lib/jekyll/reader.rb @@ -38,6 +38,8 @@ def sort_files! # Returns nothing. def read_directories(dir = "") base = site.in_source_dir(dir) + + return unless File.directory?(base) dot = Dir.chdir(base) { filter_entries(Dir.entries("."), base) } dot_dirs = dot.select { |file| File.directory?(@site.in_source_dir(base, file)) } From d66d09b38021ce3183e5883d8c6a75fc06bb2f6a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 17 Jul 2017 14:12:51 -0400 Subject: [PATCH 2/2] Remove trailing space --- lib/jekyll/reader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb index 5f778fba61a..903e36d3a48 100644 --- a/lib/jekyll/reader.rb +++ b/lib/jekyll/reader.rb @@ -38,7 +38,7 @@ def sort_files! # Returns nothing. def read_directories(dir = "") base = site.in_source_dir(dir) - + return unless File.directory?(base) dot = Dir.chdir(base) { filter_entries(Dir.entries("."), base) }