diff --git a/models/repo.go b/models/repo.go index 90e5e36b16..d13c349f11 100644 --- a/models/repo.go +++ b/models/repo.go @@ -30,9 +30,9 @@ import ( var ( ErrRepoAlreadyExist = errors.New("Repository already exist") ErrRepoNotExist = errors.New("Repository does not exist") - ErrRepoFileNotExist = errors.New("Target Repo file does not exist") + ErrRepoFileNotExist = errors.New("Repository file does not exist") ErrRepoNameIllegal = errors.New("Repository name contains illegal characters") - ErrRepoFileNotLoaded = errors.New("repo file not loaded") + ErrRepoFileNotLoaded = errors.New("Repository file not loaded") ErrMirrorNotExist = errors.New("Mirror does not exist") ) @@ -45,7 +45,7 @@ func getAssetList(prefix string) []string { assets := make([]string, 0, 15) for _, name := range bin.AssetNames() { if strings.HasPrefix(name, prefix) { - assets = append(assets, name) + assets = append(assets, strings.TrimPrefix(name, prefix+"/")) } } return assets diff --git a/models/user.go b/models/user.go index dd70a35f0b..f95f303b2b 100644 --- a/models/user.go +++ b/models/user.go @@ -121,7 +121,7 @@ func IsEmailUsed(email string) (bool, error) { return orm.Get(&User{Email: email}) } -// return a user salt token +// GetUserSalt returns a user salt token func GetUserSalt() string { return base.GetRandomString(10) }