Compare commits

..

No commits in common. "9dd8f347077d2ca6c48d4aa8178ee40628954d89" and "95db95ef91f50b2960e568161d29ada7eaafd573" have entirely different histories.

4 changed files with 7 additions and 16 deletions

View File

@ -250,7 +250,7 @@ func UploadPackage(ctx *context.Context) {
return
}
if err := cargo_service.UpdatePackageIndexIfExists(ctx, ctx.Doer, ctx.Package.Owner, pv.PackageID); err != nil {
if err := cargo_service.AddOrUpdatePackageIndex(ctx, ctx.Doer, ctx.Package.Owner, pv.PackageID); err != nil {
if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil {
log.Error("Rollback creation of package version: %v", err)
}
@ -301,7 +301,7 @@ func yankPackage(ctx *context.Context, yank bool) {
return
}
if err := cargo_service.UpdatePackageIndexIfExists(ctx, ctx.Doer, ctx.Package.Owner, pv.PackageID); err != nil {
if err := cargo_service.AddOrUpdatePackageIndex(ctx, ctx.Doer, ctx.Package.Owner, pv.PackageID); err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
}

View File

@ -106,16 +106,10 @@ func RebuildIndex(ctx context.Context, doer, owner *user_model.User) error {
)
}
func UpdatePackageIndexIfExists(ctx context.Context, doer, owner *user_model.User, packageID int64) error {
// We do not want to force the creation of the repo here
// cargo http index does not rely on the repo itself,
// so if the repo does not exist, we just do nothing.
repo, err := repo_model.GetRepositoryByOwnerAndName(ctx, owner.Name, IndexRepositoryName)
func AddOrUpdatePackageIndex(ctx context.Context, doer, owner *user_model.User, packageID int64) error {
repo, err := getOrCreateIndexRepository(ctx, doer, owner)
if err != nil {
if errors.Is(err, util.ErrNotExist) {
return nil
}
return fmt.Errorf("GetRepositoryByOwnerAndName: %w", err)
return err
}
p, err := packages_model.GetPackageByID(ctx, packageID)

View File

@ -110,8 +110,8 @@ func ExecuteCleanupRules(outerCtx context.Context) error {
if err != nil {
return fmt.Errorf("GetUserByID failed: %w", err)
}
if err := cargo_service.UpdatePackageIndexIfExists(ctx, owner, owner, p.ID); err != nil {
return fmt.Errorf("CleanupRule [%d]: cargo.UpdatePackageIndexIfExists failed: %w", pcr.ID, err)
if err := cargo_service.AddOrUpdatePackageIndex(ctx, owner, owner, p.ID); err != nil {
return fmt.Errorf("CleanupRule [%d]: cargo.AddOrUpdatePackageIndex failed: %w", pcr.ID, err)
}
}
}

View File

@ -2734,9 +2734,6 @@ tbody.commit-list {
#diff-file-boxes {
flex: 1;
max-width: 100%;
display: flex;
flex-direction: column;
gap: 8px;
}
#diff-file-tree {