diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2022-12-31 12:49:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-31 12:49:37 +0100 |
| commit | 3fef47b41c98392865d13fd21bbcec34236daf4f (patch) | |
| tree | 16808c6ea9ffd2cc0438d11831fd3a7503d15056 /modules/packages/conan | |
| parent | dce8887494268c99ba5da8d5152b5d1cc03cfb83 (diff) | |
| download | gitea-3fef47b41c98392865d13fd21bbcec34236daf4f.tar.gz gitea-3fef47b41c98392865d13fd21bbcec34236daf4f.zip | |
Use ErrInvalidArgument in packages (#22268)
Related to
https://github.com/go-gitea/gitea/pull/22262#discussion_r1059010774
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'modules/packages/conan')
| -rw-r--r-- | modules/packages/conan/conaninfo_parser.go | 5 | ||||
| -rw-r--r-- | modules/packages/conan/reference.go | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/packages/conan/conaninfo_parser.go b/modules/packages/conan/conaninfo_parser.go index 5bb3fb8930..de11dbee45 100644 --- a/modules/packages/conan/conaninfo_parser.go +++ b/modules/packages/conan/conaninfo_parser.go @@ -5,9 +5,10 @@ package conan import ( "bufio" - "errors" "io" "strings" + + "code.gitea.io/gitea/modules/util" ) // Conaninfo represents infos of a Conan package @@ -79,7 +80,7 @@ func readSections(r io.Reader) (map[string][]string, error) { continue } if line != "" { - return nil, errors.New("Invalid conaninfo.txt") + return nil, util.NewInvalidArgumentErrorf("invalid conaninfo.txt") } } if err := scanner.Err(); err != nil { diff --git a/modules/packages/conan/reference.go b/modules/packages/conan/reference.go index 37a5170dd3..58f268bd48 100644 --- a/modules/packages/conan/reference.go +++ b/modules/packages/conan/reference.go @@ -4,12 +4,12 @@ package conan import ( - "errors" "fmt" "regexp" "strings" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" ) const ( @@ -25,7 +25,7 @@ var ( namePattern = regexp.MustCompile(fmt.Sprintf(`^[a-zA-Z0-9_][a-zA-Z0-9_\+\.-]{%d,%d}$`, minChars-1, maxChars-1)) revisionPattern = regexp.MustCompile(fmt.Sprintf(`^[a-zA-Z0-9]{1,%d}$`, maxChars)) - ErrValidation = errors.New("Could not validate one or more reference fields") + ErrValidation = util.NewInvalidArgumentErrorf("could not validate one or more reference fields") ) // RecipeReference represents a recipe <Name>/<Version>@<User>/<Channel>#<Revision> |