aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2021-04-16 11:06:33 -0400
committerMatthew Heon <mheon@redhat.com>2021-04-16 11:07:33 -0400
commit2816c55f3a7138a04837694afa8bf0a515fe00ac (patch)
tree2211afa8bf7ca66b96626ebb1e5578327d0e3a3d /vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go
parentbd94d84fadda7000da78e36d9865949dc8e7adb4 (diff)
downloadpodman-2816c55f3a7138a04837694afa8bf0a515fe00ac.tar.gz
podman-2816c55f3a7138a04837694afa8bf0a515fe00ac.tar.bz2
podman-2816c55f3a7138a04837694afa8bf0a515fe00ac.zip
Update all containers/ project vendors
Bumps: - c/storage to v1.29.0 - c/image to v5.11.0 - c/common to v0.36.0 - Buildah to v1.20.1 Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go')
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go12
1 files changed, 4 insertions, 8 deletions
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go b/vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go
index d31efd660..87fee452c 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go
@@ -70,11 +70,9 @@ func SetupContainerBaseLayer(ctx context.Context, layerPath, baseVhdPath, diffVh
defer func() {
if err != nil {
- syscall.CloseHandle(handle)
+ _ = syscall.CloseHandle(handle)
os.RemoveAll(baseVhdPath)
- if os.Stat(diffVhdPath); err == nil {
- os.RemoveAll(diffVhdPath)
- }
+ os.RemoveAll(diffVhdPath)
}
}()
@@ -148,11 +146,9 @@ func SetupUtilityVMBaseLayer(ctx context.Context, uvmPath, baseVhdPath, diffVhdP
defer func() {
if err != nil {
- syscall.CloseHandle(handle)
+ _ = syscall.CloseHandle(handle)
os.RemoveAll(baseVhdPath)
- if os.Stat(diffVhdPath); err == nil {
- os.RemoveAll(diffVhdPath)
- }
+ os.RemoveAll(diffVhdPath)
}
}()