phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

commands: Suppress 'missing static' error

Browse source 
Fixes #2311
This commit is contained in:
Kishin Yagami 2016-08-14 07:35:43 +09:00 committed by Bjørn Erik Pedersen
parent f6d4801ba4
commit 661c9787ea
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
commands/hugo.go
View file

@ -625,6 +625,7 @@ func getDirList() []string {
var a []string var a []string
dataDir := helpers.AbsPathify(viper.GetString("DataDir")) dataDir := helpers.AbsPathify(viper.GetString("DataDir"))
layoutDir := helpers.AbsPathify(viper.GetString("LayoutDir")) layoutDir := helpers.AbsPathify(viper.GetString("LayoutDir"))
staticDir := helpers.AbsPathify(viper.GetString("StaticDir"))
walker := func(path string, fi os.FileInfo, err error) error { walker := func(path string, fi os.FileInfo, err error) error {
if err != nil { if err != nil {
if path == dataDir && os.IsNotExist(err) { if path == dataDir && os.IsNotExist(err) {
@ -635,8 +636,13 @@ func getDirList() []string {
if path == layoutDir && os.IsNotExist(err) { if path == layoutDir && os.IsNotExist(err) {
jww.WARN.Println("Skip LayoutDir:", err) jww.WARN.Println("Skip LayoutDir:", err)
return nil return nil
} }
if path == staticDir && os.IsNotExist(err) {
jww.WARN.Println("Skip StaticDir:", err)
return nil
}
jww.ERROR.Println("Walker: ", err) jww.ERROR.Println("Walker: ", err)
return nil return nil
} }
@ -671,7 +677,7 @@ func getDirList() []string {
helpers.SymbolicWalk(hugofs.Source(), dataDir, walker) helpers.SymbolicWalk(hugofs.Source(), dataDir, walker)
helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("ContentDir")), walker) helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("ContentDir")), walker)
helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("LayoutDir")), walker) helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("LayoutDir")), walker)
helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("StaticDir")), walker) helpers.SymbolicWalk(hugofs.Source(), staticDir, walker)
if helpers.ThemeSet() { if helpers.ThemeSet() {
helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("themesDir")+"/"+viper.GetString("theme")), walker) helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("themesDir")+"/"+viper.GetString("theme")), walker)
} }