shithub: hugo

Download patch

ref: 2542836bbc8f2595d69b59f6346334213a8781fb
parent: 8f330626bcbe3413b853dda98e17352af9067d44
parent: 0f143dcf1498897d2f7b83fad6830fd964b3ef95
author: Steve Francia <[email protected]>
date: Sat Aug 17 16:59:07 EDT 2013

Merge pull request #41 from rozza/skipStatic

Skip Static directory if its in your content directory

--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -194,6 +194,8 @@
 
 	s.checkDirectories()
 
+	staticDir := s.Config.GetAbsPath(s.Config.StaticDir+"/")
+
 	walker := func(path string, fi os.FileInfo, err error) error {
 		if err != nil {
 			PrintErr("Walker: ", err)
@@ -201,6 +203,9 @@
 		}
 
 		if fi.IsDir() {
+			if (path == staticDir) {
+				return filepath.SkipDir
+			}
 			site.Directories = append(site.Directories, path)
 			return nil
 		} else {
@@ -213,7 +218,6 @@
 	}
 
 	filepath.Walk(s.absContentDir(), walker)
-
 	s.Info = SiteInfo{
 		BaseUrl: template.URL(s.Config.BaseUrl),
 		Title:   s.Config.Title,