From: Tatsushi Demachi <tdemachi@gmail.com>
Date: Sun, 31 Jan 2016 15:21:12 +0000 (+0900)
Subject: Fix Hugo hang up with empty content directory
X-Git-Tag: v0.16~390
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=68e2e63d;p=brevno-suite%2Fhugo

Fix Hugo hang up with empty content directory

Site.ReadPagesFromSource returns nil chan error value when a site
content directory is empty but its receiver expects to be passed
something error values via the channel.

This fixes it by returning a channel which will be immediately closed.

Fix #1797
---

diff --git a/hugolib/site.go b/hugolib/site.go
index de3f7c8c..037ae275 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -876,8 +876,11 @@ func (s *Site) ReadPagesFromSource() chan error {
 		panic(fmt.Sprintf("s.Source not set %s", s.absContentDir()))
 	}
 
+	errs := make(chan error)
+
 	if len(s.Source.Files()) < 1 {
-		return nil
+		close(errs)
+		return errs
 	}
 
 	files := s.Source.Files()
@@ -891,8 +894,6 @@ func (s *Site) ReadPagesFromSource() chan error {
 		go sourceReader(s, filechan, results, wg)
 	}
 
-	errs := make(chan error)
-
 	// we can only have exactly one result collator, since it makes changes that
 	// must be synchronized.
 	go readCollator(s, results, errs)