Merge pull request #172 from Mashimiao/cleanup-bundle

cleanup created bundle when creating failed
opencontainers · Aug 29, 2017 · cfb23a2 · cfb23a2
2 parents bb2d6e7 + 4abe1a1
commit cfb23a2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/image/image.go b/image/image.go
@@ -290,7 +290,7 @@ func createRuntimeBundle(w walker, dest, refName, rootfs, platform string) error
 	return nil
 }
 
-func createBundle(w walker, m *manifest, dest, rootfs string) error {
+func createBundle(w walker, m *manifest, dest, rootfs string) (retErr error) {
 	c, err := findConfig(w, &m.Config)
 	if err != nil {
 		return err
@@ -301,6 +301,13 @@ func createBundle(w walker, m *manifest, dest, rootfs string) error {
 			if err2 := os.MkdirAll(dest, 0755); err2 != nil {
 				return err2
 			}
+			defer func() {
+				if retErr != nil {
+					if err3 := os.RemoveAll(dest); err3 != nil {
+						fmt.Printf("Failed to clean up %q: %s\n", dest, err3.Error())
+					}
+				}
+			}()
 		} else {
 			return err
 		}