1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-11 17:50:58 +00:00

fix: Do not fail on nil error

Commit 5a351d33df has introduced a
regression due to which copyDir() would fail after closing the archive
successfully

Signed-off-by: Vitaliy Potyarkin <v.potyarkin@yadro.com>
This commit is contained in:
Vitaliy Potyarkin 2024-12-27 17:56:23 +03:00
parent c3adea9750
commit 324188e239

View file

@ -753,7 +753,7 @@ func (cr *containerReference) copyDir(dstPath string, srcPath string, useGitIgno
defer func(tarFile *os.File) { defer func(tarFile *os.File) {
name := tarFile.Name() name := tarFile.Name()
err := tarFile.Close() err := tarFile.Close()
if !errors.Is(err, os.ErrClosed) { if err != nil && !errors.Is(err, os.ErrClosed) {
logger.Error(err) logger.Error(err)
} }
err = os.Remove(name) err = os.Remove(name)