From beb32af7a29bb50f3d461d52120309980cf44688 Mon Sep 17 00:00:00 2001 From: bep Date: Wed, 22 Apr 2015 18:36:07 +0200 Subject: [PATCH] Do not fail on unknown files in /data Fixes #1068 --- hugolib/datafiles_test.go | 4 ++-- hugolib/site.go | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hugolib/datafiles_test.go b/hugolib/datafiles_test.go index 00e1b2d77..84eb70bdf 100644 --- a/hugolib/datafiles_test.go +++ b/hugolib/datafiles_test.go @@ -75,8 +75,8 @@ func TestDataDirUnknownFormat(t *testing.T) { } s := &Site{} err := s.loadData([]source.Input{&source.InMemorySource{ByteSource: sources}}) - if err == nil { - t.Fatalf("Should return an error") + if err != nil { + t.Fatalf("Should not return an error") } } diff --git a/hugolib/site.go b/hugolib/site.go index 46c60a194..4f7d04bea 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -307,6 +307,10 @@ func (s *Site) loadData(sources []source.Input) (err error) { return fmt.Errorf("Failed to read data from %s: %s", filepath.Join(r.Path(), r.LogicalName()), err) } + if data == nil { + continue + } + // Copy content from current to data when needed if _, ok := current[r.BaseFileName()]; ok { data := data.(map[string]interface{}) @@ -340,7 +344,8 @@ func readData(f *source.File) (interface{}, error) { case "toml": return parser.HandleTOMLMetaData(f.Bytes()) default: - return nil, fmt.Errorf("Data not supported for extension '%s'", f.Extension()) + jww.WARN.Printf("Data not supported for extension '%s'", f.Extension()) + return nil, nil } }