helpers: Remove "no theme set" warning - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 8b0c3b9b271c7f3eaa812f7a98bb738fe9cc1846
DIR parent 34c87421b82b967a8ae85261ca9a3e9fe7b156da
HTML Author: Cameron Moore <moorereason@gmail.com>
Date: Thu, 22 Dec 2016 22:44:35 -0600
helpers: Remove "no theme set" warning
Fixes #2821
Diffstat:
M commands/hugo.go | 4 +++-
M helpers/path.go | 11 ++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
---
DIR diff --git a/commands/hugo.go b/commands/hugo.go
@@ -472,7 +472,9 @@ func getStaticSourceFs() afero.Fs {
useStatic := true
if err != nil {
- jww.WARN.Println(err)
+ if err != helpers.ErrThemeUndefined {
+ jww.WARN.Println(err)
+ }
useTheme = false
} else {
if _, err := source.Stat(themeDir); os.IsNotExist(err) {
DIR diff --git a/helpers/path.go b/helpers/path.go
@@ -31,6 +31,13 @@ import (
"golang.org/x/text/unicode/norm"
)
+var (
+ // ErrThemeUndefined is returned when a theme has not be defined by the user.
+ ErrThemeUndefined = errors.New("no theme set")
+
+ ErrWalkRootTooShort = errors.New("Path too short. Stop walking.")
+)
+
// filepathPathBridge is a bridge for common functionality in filepath vs path
type filepathPathBridge interface {
Base(in string) string
@@ -207,7 +214,7 @@ func GetThemeI18nDirPath() (string, error) {
func getThemeDirPath(path string) (string, error) {
if !ThemeSet() {
- return "", errors.New("No theme set")
+ return "", ErrThemeUndefined
}
themeDir := filepath.Join(GetThemeDir(), path)
@@ -485,8 +492,6 @@ func FindCWD() (string, error) {
return path, nil
}
-var ErrWalkRootTooShort = errors.New("Path too short. Stop walking.")
-
// SymbolicWalk is like filepath.Walk, but it supports the root being a
// symbolic link. It will still not follow symbolic links deeper down in
// the file structure