fix merge

wxiaoguang · wxiaoguang · commit d35d45d2ea31 · 2025-04-13T12:56:01.000+08:00
diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go
@@ -114,12 +114,9 @@ func getPackageDescriptor(ctx context.Context, pv *PackageVersion, c *cache) (*P
 	if err != nil {
 		return nil, err
 	}
-	repository, err := c.QueryRepository(ctx, p.RepoID)
-	if err != nil {
-		return nil, err
 	var repository *repo_model.Repository
 	if p.RepoID > 0 {
-		repository, err = repo_model.GetRepositoryByID(ctx, p.RepoID)
+		repository, err = c.QueryRepository(ctx, p.RepoID)
 		if err != nil && !repo_model.IsErrRepoNotExist(err) {
 			return nil, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -114,12 +114,9 @@ func getPackageDescriptor(ctx context.Context, pv PackageVersion, c cache) (*P`
`114`	`114`	`if err != nil {`
`115`	`115`	`return nil, err`
`116`	`116`	`}`
`117`		`- repository, err := c.QueryRepository(ctx, p.RepoID)`
`118`		`- if err != nil {`
`119`		`- return nil, err`
`120`	`117`	`var repository *repo_model.Repository`
`121`	`118`	`if p.RepoID > 0 {`
`122`		`- repository, err = repo_model.GetRepositoryByID(ctx, p.RepoID)`
	`119`	`+ repository, err = c.QueryRepository(ctx, p.RepoID)`
`123`	`120`	`if err != nil && !repo_model.IsErrRepoNotExist(err) {`
`124`	`121`	`return nil, err`
`125`	`122`	`}`