@@ -252,27 +252,30 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
252
252
}
253
253
254
254
// download attachment
255
- resp , err := http .Get (asset .URL )
256
- if err != nil {
257
- return err
258
- }
259
- defer resp .Body .Close ()
255
+ err = func () error {
256
+ resp , err := http .Get (asset .URL )
257
+ if err != nil {
258
+ return err
259
+ }
260
+ defer resp .Body .Close ()
260
261
261
- localPath := attach .LocalPath ()
262
- if err = os .MkdirAll (path .Dir (localPath ), os .ModePerm ); err != nil {
263
- return fmt .Errorf ("MkdirAll: %v" , err )
264
- }
262
+ localPath := attach .LocalPath ()
263
+ if err = os .MkdirAll (path .Dir (localPath ), os .ModePerm ); err != nil {
264
+ return fmt .Errorf ("MkdirAll: %v" , err )
265
+ }
265
266
266
- fw , err := os .Create (localPath )
267
- if err != nil {
268
- return fmt .Errorf ("Create: %v" , err )
269
- }
270
- defer fw .Close ()
267
+ fw , err := os .Create (localPath )
268
+ if err != nil {
269
+ return fmt .Errorf ("Create: %v" , err )
270
+ }
271
+ defer fw .Close ()
271
272
272
- if _ , err := io .Copy (fw , resp .Body ); err != nil {
273
+ _ , err = io .Copy (fw , resp .Body )
274
+ return err
275
+ }()
276
+ if err != nil {
273
277
return err
274
278
}
275
-
276
279
rel .Attachments = append (rel .Attachments , & attach )
277
280
}
278
281
@@ -468,21 +471,24 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
468
471
}
469
472
470
473
// download patch file
471
- resp , err := http .Get (pr .PatchURL )
472
- if err != nil {
473
- return nil , err
474
- }
475
- defer resp .Body .Close ()
476
- pullDir := filepath .Join (g .repo .RepoPath (), "pulls" )
477
- if err = os .MkdirAll (pullDir , os .ModePerm ); err != nil {
478
- return nil , err
479
- }
480
- f , err := os .Create (filepath .Join (pullDir , fmt .Sprintf ("%d.patch" , pr .Number )))
481
- if err != nil {
482
- return nil , err
483
- }
484
- defer f .Close ()
485
- _ , err = io .Copy (f , resp .Body )
474
+ err := func () error {
475
+ resp , err := http .Get (pr .PatchURL )
476
+ if err != nil {
477
+ return err
478
+ }
479
+ defer resp .Body .Close ()
480
+ pullDir := filepath .Join (g .repo .RepoPath (), "pulls" )
481
+ if err = os .MkdirAll (pullDir , os .ModePerm ); err != nil {
482
+ return err
483
+ }
484
+ f , err := os .Create (filepath .Join (pullDir , fmt .Sprintf ("%d.patch" , pr .Number )))
485
+ if err != nil {
486
+ return err
487
+ }
488
+ defer f .Close ()
489
+ _ , err = io .Copy (f , resp .Body )
490
+ return err
491
+ }()
486
492
if err != nil {
487
493
return nil , err
488
494
}
@@ -496,8 +502,8 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
496
502
if err != nil {
497
503
return nil , err
498
504
}
499
- defer p .Close ()
500
505
_ , err = p .WriteString (pr .Head .SHA )
506
+ p .Close ()
501
507
if err != nil {
502
508
return nil , err
503
509
}
@@ -531,8 +537,8 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
531
537
if err != nil {
532
538
return nil , err
533
539
}
534
- defer b .Close ()
535
540
_ , err = b .WriteString (pr .Head .SHA )
541
+ b .Close ()
536
542
if err != nil {
537
543
return nil , err
538
544
}
0 commit comments