Permalink
Browse files

hugolib: Fix handling of zero-length files

This was a regression in Hugo 0.20. This commit makes sure that zeron-length files are not rendered to file.

Fixes #3355
  • Loading branch information...
bep committed Apr 23, 2017
1 parent 1726e90 commit 9bf5c381b6b3e69d4d8dbfd7a40074ac44792bbf
Showing with 28 additions and 0 deletions.
  1. +4 −0 hugolib/site.go
  2. +4 −0 hugolib/site_render.go
  3. +14 −0 hugolib/site_test.go
  4. +6 −0 hugolib/testhelpers_test.go
View
@@ -1926,6 +1926,10 @@ func (s *Site) renderAndWritePage(name string, dest string, p *PageOutput, layou
return nil
}
if renderBuffer.Len() == 0 {
return nil
}
outBuffer := bp.GetBuffer()
defer bp.PutBuffer(outBuffer)
View
@@ -340,6 +340,10 @@ func (s *Site) renderRobotsTXT() error {
return nil
}
if outBuffer.Len() == 0 {
return nil
}
return s.publish("robots.txt", outBuffer)
}
View
@@ -376,6 +376,20 @@ func TestNewSiteDefaultLang(t *testing.T) {
require.Equal(t, hugofs.Os, s.Fs.Destination)
}
// Issue #3355
func TestShouldNotWriteZeroLengthFilesToDestination(t *testing.T) {
cfg, fs := newTestCfg()
writeSource(t, fs, filepath.Join("content", "simple.html"), "simple")
writeSource(t, fs, filepath.Join("layouts", "_default/single.html"), "{{.Content}}")
writeSource(t, fs, filepath.Join("layouts", "_default/list.html"), "")
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{})
th := testHelper{s.Cfg, s.Fs, t}
th.assertFileNotExist(filepath.Join("public", "index.html"))
}
// Issue #1176
func TestSectionNaming(t *testing.T) {
t.Parallel()
@@ -61,6 +61,12 @@ func (th testHelper) assertFileContentRegexp(filename string, matches ...string)
}
}
func (th testHelper) assertFileNotExist(filename string) {
exists, err := helpers.Exists(filename, th.Fs.Destination)
require.NoError(th.T, err)
require.False(th.T, exists)
}
func (th testHelper) replaceDefaultContentLanguageValue(value string) string {
defaultInSubDir := th.Cfg.GetBool("defaultContentLanguageInSubDir")
replace := th.Cfg.GetString("defaultContentLanguage") + "/"

0 comments on commit 9bf5c38

Please sign in to comment.