pull/33214/head
wxiaoguang 2 months ago
parent 5c150ce9b0
commit 25d25b45ee
  1. 17
      routers/api/packages/container/manifest.go

@ -356,10 +356,6 @@ func createPackageAndVersion(ctx context.Context, mci *manifestCreationInfo, met
return nil, err return nil, err
} }
if err = packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil {
return nil, err
}
// keep download count on overwrite // keep download count on overwrite
_pv.DownloadCount = pv.DownloadCount _pv.DownloadCount = pv.DownloadCount
@ -418,13 +414,11 @@ func createFileFromBlobReference(ctx context.Context, pv, uploadVersion *package
} }
var err error var err error
if pf, err = packages_model.TryInsertFile(ctx, pf); err != nil { if pf, err = packages_model.TryInsertFile(ctx, pf); err != nil {
if errors.Is(err, packages_model.ErrDuplicatePackageFile) { if !errors.Is(err, packages_model.ErrDuplicatePackageFile) {
// Skip this blob because the manifest contains the same filesystem layer multiple times.
return nil
}
log.Error("Error inserting package file: %v", err) log.Error("Error inserting package file: %v", err)
return err return err
} }
}
props := map[string]string{ props := map[string]string{
container_module.PropertyMediaType: ref.MediaType, container_module.PropertyMediaType: ref.MediaType,
@ -437,13 +431,6 @@ func createFileFromBlobReference(ctx context.Context, pv, uploadVersion *package
} }
} }
// Remove the file from the blob upload version
if uploadVersion != nil && ref.File.File != nil && uploadVersion.ID == ref.File.File.VersionID {
if err := packages_service.DeletePackageFile(ctx, ref.File.File); err != nil {
return err
}
}
return nil return nil
} }

Loading…
Cancel
Save