upgrade to go 1.20

use errors.Join
This commit is contained in:
Motiejus Jakštys
2023-05-19 15:01:44 +03:00
parent 725fb5679b
commit e6d1a95c02
3 changed files with 6 additions and 13 deletions

View File

@@ -144,11 +144,7 @@ func Flatten(rd io.ReadSeeker, w io.Writer) (_err error) {
tw := tar.NewWriter(w)
defer func() {
// Avoiding use of multierr: if error is present, return
// that. Otherwise return whatever `Close` returns.
if err := tw.Close(); err != nil && _err == nil {
_err = err
}
_err = errors.Join(_err, tw.Close())
}()
// iterate through all layers, all files, and write files.
for i, no := range layers {