Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix and improve incorrect error messages #21342

Merged
merged 5 commits into from
Oct 6, 2022
Merged

Fix and improve incorrect error messages #21342

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2ac728
Fix and improve incorrect error messages
delvh Oct 5, 2022
cc83a50
Convert error messages to lowercase
delvh Oct 5, 2022
f598f59
Update copyright notice
delvh Oct 5, 2022
6dd69e9
Further improve error messages as per @zeripath
delvh Oct 5, 2022
3af7312
Merge branch 'main' into bugfix/incorrect-error-message
zeripath Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions modules/options/static.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -32,24 +32,23 @@ 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...)
}

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
}

Expand Down