diff options
| author | Valentin Rothberg <vrothberg@redhat.com> | 2022-03-21 14:49:47 +0100 |
|---|---|---|
| committer | Valentin Rothberg <vrothberg@redhat.com> | 2022-03-22 13:04:35 +0100 |
| commit | 0f12b6fe55f6b5ce70d8c388ec2df35db9feffbb (patch) | |
| tree | 1fb296cb38e545e367824532bc0e3d2a8ace6a54 /pkg/checkpoint | |
| parent | 081e09143747b01c15071ba1bf80cafe60f5818e (diff) | |
| download | podman-0f12b6fe55f6b5ce70d8c388ec2df35db9feffbb.tar.gz podman-0f12b6fe55f6b5ce70d8c388ec2df35db9feffbb.tar.bz2 podman-0f12b6fe55f6b5ce70d8c388ec2df35db9feffbb.zip | |
linter: enable nilerr
A number of cases looked suspicious, so I marked them with `FIXME`s to
leave some breadcrumbs.
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Diffstat (limited to 'pkg/checkpoint')
| -rw-r--r-- | pkg/checkpoint/crutils/checkpoint_restore_utils.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkg/checkpoint/crutils/checkpoint_restore_utils.go b/pkg/checkpoint/crutils/checkpoint_restore_utils.go index 2765d18e8..5b2097a71 100644 --- a/pkg/checkpoint/crutils/checkpoint_restore_utils.go +++ b/pkg/checkpoint/crutils/checkpoint_restore_utils.go @@ -99,13 +99,12 @@ func CRRemoveDeletedFiles(id, baseDirectory, containerRootDirectory string) erro // root file system changes on top of containerRootDirectory func CRApplyRootFsDiffTar(baseDirectory, containerRootDirectory string) error { rootfsDiffPath := filepath.Join(baseDirectory, metadata.RootFsDiffTar) - if _, err := os.Stat(rootfsDiffPath); err != nil { - // Only do this if a rootfs-diff.tar actually exists - return nil - } - + // Only do this if a rootfs-diff.tar actually exists rootfsDiffFile, err := os.Open(rootfsDiffPath) if err != nil { + if os.IsNotExist(err) { + return nil + } return errors.Wrap(err, "failed to open root file-system diff file") } defer rootfsDiffFile.Close() |