mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-10 20:22:14 +02:00
parent
1294f6c511
commit
b001812df4
1 changed files with 4 additions and 5 deletions
|
@ -1,4 +1,4 @@
|
|||
// Copyright 2016 The Gitea Authors. All rights reserved.
|
||||
// Copyright 2022 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
|
@ -32,12 +32,12 @@ func Dir(name string) ([]string, error) {
|
|||
customDir := path.Join(setting.CustomPath, "options", name)
|
||||
isDir, err := util.IsDir(customDir)
|
||||
if err != nil {
|
||||
return []string{}, fmt.Errorf("Failed to check if custom directory %s is a directory. %v", err)
|
||||
return []string{}, fmt.Errorf("unable to check if custom directory %q is a directory. %w", customDir, err)
|
||||
}
|
||||
if isDir {
|
||||
files, err := util.StatDir(customDir, true)
|
||||
if err != nil {
|
||||
return []string{}, fmt.Errorf("Failed to read custom directory. %v", err)
|
||||
return []string{}, fmt.Errorf("unable to read custom directory %q. %w", customDir, err)
|
||||
}
|
||||
|
||||
result = append(result, files...)
|
||||
|
@ -45,11 +45,10 @@ func Dir(name string) ([]string, error) {
|
|||
|
||||
files, err := AssetDir(name)
|
||||
if err != nil {
|
||||
return []string{}, fmt.Errorf("Failed to read embedded directory. %v", err)
|
||||
return []string{}, fmt.Errorf("unable to read embedded directory %q. %w", name, err)
|
||||
}
|
||||
|
||||
result = append(result, files...)
|
||||
|
||||
return directories.AddAndGet(name, result), nil
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue