From dcea5ece28701fde089c63012f4b46dd37cc9c9b Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Sat, 6 Mar 2021 18:32:18 -0800 Subject: [PATCH] Minor bug with removing container name if import fails. Fixed. --- internal/app/wwctl/container/imprt/main.go | 4 ++-- internal/pkg/container/util.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/app/wwctl/container/imprt/main.go b/internal/app/wwctl/container/imprt/main.go index 03d9cc2e..929404a4 100644 --- a/internal/app/wwctl/container/imprt/main.go +++ b/internal/app/wwctl/container/imprt/main.go @@ -109,14 +109,14 @@ func CobraRunE(cmd *cobra.Command, args []string) error { err = container.ImportDocker(uri, name, sCtx) if err != nil { wwlog.Printf(wwlog.ERROR, "Could not import image: %s\n", err) - _ = container.DeleteSource(uri) + _ = container.DeleteSource(name) os.Exit(1) } } else if util.IsDir(uri) { err := container.ImportDirectory(uri, name) if err != nil { wwlog.Printf(wwlog.ERROR, "Could not import image: %s\n", err) - _ = container.DeleteSource(uri) + _ = container.DeleteSource(name) os.Exit(1) } } diff --git a/internal/pkg/container/util.go b/internal/pkg/container/util.go index a9effc37..a138b313 100644 --- a/internal/pkg/container/util.go +++ b/internal/pkg/container/util.go @@ -88,5 +88,6 @@ func ValidSource(name string) bool { func DeleteSource(name string) error { fullPath := SourceDir(name) + wwlog.Printf(wwlog.VERBOSE, "Removing path: %s\n", fullPath) return os.RemoveAll(fullPath) }