Merge branch 'master' into v2

This commit is contained in:
Marius 2021-07-01 18:49:09 +02:00
commit 675e767ee6
1 changed files with 1 additions and 1 deletions

View File

@ -717,7 +717,7 @@ func (upload s3Upload) GetReader(ctx context.Context) (io.Reader, error) {
}) })
if err == nil { if err == nil {
// The multipart upload still exists, which means we cannot download it yet // The multipart upload still exists, which means we cannot download it yet
return nil, errors.New("cannot stream non-finished upload") return nil, handler.NewHTTPError(errors.New("cannot stream non-finished upload"), http.StatusBadRequest)
} }
if isAwsError(err, "NoSuchUpload") { if isAwsError(err, "NoSuchUpload") {