Skip to content

Commit f0d0c2e

Browse files
committed
fix
1 parent 0d3e995 commit f0d0c2e

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

routers/api/packages/container/manifest.go

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,6 @@ func createPackageAndVersion(ctx context.Context, mci *manifestCreationInfo, met
356356
return nil, err
357357
}
358358

359-
if err = packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil {
360-
return nil, err
361-
}
362-
363359
// keep download count on overwrite
364360
_pv.DownloadCount = pv.DownloadCount
365361

@@ -418,12 +414,10 @@ func createFileFromBlobReference(ctx context.Context, pv, uploadVersion *package
418414
}
419415
var err error
420416
if pf, err = packages_model.TryInsertFile(ctx, pf); err != nil {
421-
if errors.Is(err, packages_model.ErrDuplicatePackageFile) {
422-
// Skip this blob because the manifest contains the same filesystem layer multiple times.
423-
return nil
417+
if !errors.Is(err, packages_model.ErrDuplicatePackageFile) {
418+
log.Error("Error inserting package file: %v", err)
419+
return err
424420
}
425-
log.Error("Error inserting package file: %v", err)
426-
return err
427421
}
428422

429423
props := map[string]string{
@@ -437,13 +431,6 @@ func createFileFromBlobReference(ctx context.Context, pv, uploadVersion *package
437431
}
438432
}
439433

440-
// Remove the file from the blob upload version
441-
if uploadVersion != nil && ref.File.File != nil && uploadVersion.ID == ref.File.File.VersionID {
442-
if err := packages_service.DeletePackageFile(ctx, ref.File.File); err != nil {
443-
return err
444-
}
445-
}
446-
447434
return nil
448435
}
449436

0 commit comments

Comments
 (0)