From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 13 Jun 2018 06:48:20 +0000 (+0200)
Subject: commands: Do not fail server build when /static is missing
X-Git-Tag: v0.42.1~5
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=34ee27a78b9e2b5f475d44253ae234067b76cc6e;p=brevno-suite%2Fhugo

commands: Do not fail server build when /static is missing

This was a un-intended change in Hugo 0.42. Most sites will have a static directory so this should not be a big issue, but this commit will revert back to old behaviour.

Fixes #4846
---

diff --git a/commands/commands_test.go b/commands/commands_test.go
index d576b442..907f003c 100644
--- a/commands/commands_test.go
+++ b/commands/commands_test.go
@@ -235,11 +235,6 @@ Single: {{ .Title }}
 
 List: {{ .Title }}
 
-`)
-
-	writeFile(t, filepath.Join(d, "static", "my.txt"), `
-MyMy
-
 `)
 
 	return d, nil
diff --git a/commands/hugo.go b/commands/hugo.go
index c4fee122..5c87bd96 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -277,7 +277,10 @@ func (c *commandeer) fullBuild() error {
 	copyStaticFunc := func() error {
 		cnt, err := c.copyStatic()
 		if err != nil {
-			return fmt.Errorf("Error copying static files: %s", err)
+			if !os.IsNotExist(err) {
+				return fmt.Errorf("Error copying static files: %s", err)
+			}
+			c.Logger.WARN.Println("No Static directory found")
 		}
 		langCount = cnt
 		langCount = cnt