mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-11 20:03:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

all: Propagate baseURL error to the callers

Browse Source
This commit is contained in:
Bjørn Erik Pedersen
2017-03-25 14:37:04 +01:00
parent 148fedd227
commit 15b64d51da
18 changed files with 124 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
helpers/pathspec.go
View File

@@ -60,10 +60,14 @@ func (p PathSpec) String() string {
}
// NewPathSpec creats a new PathSpec from the given filesystems and Language.
func NewPathSpec(fs *hugofs.Fs, cfg config.Provider) *PathSpec {
func NewPathSpec(fs *hugofs.Fs, cfg config.Provider) (*PathSpec, error) {
// TODO(bep) output error handling
baseURL, _ := newBaseURLFromString(cfg.GetString("baseURL"))
baseURLstr := cfg.GetString("baseURL")
baseURL, err := newBaseURLFromString(baseURLstr)
if err != nil {
return nil, fmt.Errorf("Failed to create baseURL from %q: %s", baseURLstr, err)
}
ps := &PathSpec{
fs: fs,
@@ -87,7 +91,7 @@ func NewPathSpec(fs *hugofs.Fs, cfg config.Provider) *PathSpec {
ps.language = language
}
return ps
return ps, nil
}
// PaginatePath returns the configured root path used for paginator pages.