fix merge

Author: wxiaoguang

routers/api/v1/packages/package.go

@@ -252,19 +252,19 @@ func LinkPackage(ctx *context.APIContext) {
 	pkg, err := packages.GetPackageByName(ctx, ctx.ContextUser.ID, packages.Type(ctx.PathParam("type")), ctx.PathParam("name"))
 	if err != nil {
 		if errors.Is(err, util.ErrNotExist) {
-			ctx.Error(http.StatusNotFound, "GetPackageByName", err)
+			ctx.APIError(http.StatusNotFound, err)
 		} else {
-			ctx.Error(http.StatusInternalServerError, "GetPackageByName", err)
+			ctx.APIErrorInternal(err)
 		}
 		return
 	}
 
 	repo, err := repo_model.GetRepositoryByName(ctx, ctx.ContextUser.ID, ctx.PathParam("repo_name"))
 	if err != nil {
 		if errors.Is(err, util.ErrNotExist) {
-			ctx.Error(http.StatusNotFound, "GetRepositoryByName", err)
+			ctx.APIError(http.StatusNotFound, err)
 		} else {
-			ctx.Error(http.StatusInternalServerError, "GetRepositoryByName", err)
+			ctx.APIErrorInternal(err)
 		}
 		return
 	}
@@ -273,11 +273,11 @@ func LinkPackage(ctx *context.APIContext) {
 	if err != nil {
 		switch {
 		case errors.Is(err, util.ErrInvalidArgument):
-			ctx.Error(http.StatusBadRequest, "LinkToRepository", err)
+			ctx.APIError(http.StatusBadRequest, err)
 		case errors.Is(err, util.ErrPermissionDenied):
-			ctx.Error(http.StatusForbidden, "LinkToRepository", err)
+			ctx.APIError(http.StatusForbidden, err)
 		default:
-			ctx.Error(http.StatusInternalServerError, "LinkToRepository", err)
+			ctx.APIErrorInternal(err)
 		}
 		return
 	}
@@ -314,9 +314,9 @@ func UnlinkPackage(ctx *context.APIContext) {
 	pkg, err := packages.GetPackageByName(ctx, ctx.ContextUser.ID, packages.Type(ctx.PathParam("type")), ctx.PathParam("name"))
 	if err != nil {
 		if errors.Is(err, util.ErrNotExist) {
-			ctx.Error(http.StatusNotFound, "GetPackageByName", err)
+			ctx.APIError(http.StatusNotFound, err)
 		} else {
-			ctx.Error(http.StatusInternalServerError, "GetPackageByName", err)
+			ctx.APIErrorInternal(err)
 		}
 		return
 	}
@@ -325,11 +325,11 @@ func UnlinkPackage(ctx *context.APIContext) {
 	if err != nil {
 		switch {
 		case errors.Is(err, util.ErrPermissionDenied):
-			ctx.Error(http.StatusForbidden, "UnlinkFromRepository", err)
+			ctx.APIError(http.StatusForbidden, err)
 		case errors.Is(err, util.ErrInvalidArgument):
-			ctx.Error(http.StatusBadRequest, "UnlinkFromRepository", err)
+			ctx.APIError(http.StatusBadRequest, err)
 		default:
-			ctx.Error(http.StatusInternalServerError, "UnlinkFromRepository", err)
+			ctx.APIErrorInternal(err)
 		}
 		return
 	}