From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 15 Aug 2018 15:14:03 +0000 (+0200)
Subject: hugolib: Fix error when deleting a bundle in server mode
X-Git-Tag: v0.47~15
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0a88741fe;p=brevno-suite%2Fhugo

hugolib: Fix error when deleting a bundle in server mode

Fixes #5077
---

diff --git a/hugolib/page_bundler_capture.go b/hugolib/page_bundler_capture.go
index 92b3efe4..15a80681 100644
--- a/hugolib/page_bundler_capture.go
+++ b/hugolib/page_bundler_capture.go
@@ -135,11 +135,17 @@ func (c *capturer) capturePartial(filenames ...string) error {
 		switch tp {
 		case bundleLeaf:
 			if err := c.handleDir(resolvedFilename); err != nil {
-				return err
+				// Directory may have been deleted.
+				if !os.IsNotExist(err) {
+					return err
+				}
 			}
 		case bundleBranch:
 			if err := c.handleBranchDir(resolvedFilename); err != nil {
-				return err
+				// Directory may have been deleted.
+				if !os.IsNotExist(err) {
+					return err
+				}
 			}
 		default:
 			fi, err := c.resolveRealPath(resolvedFilename)
@@ -510,7 +516,7 @@ func (c *capturer) readDir(dirname string) (pathLangFileFis, error) {
 
 	dir, err := c.fs.Open(dirname)
 	if err != nil {
-		return nil, fmt.Errorf("readDir: %s", err)
+		return nil, err
 	}
 	defer dir.Close()
 	fis, err := dir.Readdir(-1)