init: Don't create anything in case of failure.

Matthieu Nottale · Matthieu Nottale · commit 89e73b7531f0 · 2018-04-25T16:05:03.000+02:00
Signed-off-by: Matthieu Nottale &lt;matthieu.nottale@docker.com&gt;
diff --git a/packager/init.go b/packager/init.go
@@ -25,7 +25,13 @@ func Init(name string, composeFile string) error {
 	if err := os.Mkdir(dirName, 0755); err != nil {
 		return err
 	}
-	if err := writeMetadataFile(name, dirName); err != nil {
+	var err error
+	defer func() {
+		if err != nil {
+			os.RemoveAll(dirName)
+		}
+	}()
+	if err = writeMetadataFile(name, dirName); err != nil {
 		return err
 	}
 
@@ -35,9 +41,11 @@ func Init(name string, composeFile string) error {
 		}
 	}
 	if composeFile == "" {
-		return initFromScratch(name)
+		err = initFromScratch(name)
+	} else {
+		err = initFromComposeFile(name, composeFile)
 	}
-	return initFromComposeFile(name, composeFile)
+	return err
 }
 
 func initFromScratch(name string) error {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,13 @@ func Init(name string, composeFile string) error {`
`25`	`25`	`if err := os.Mkdir(dirName, 0755); err != nil {`
`26`	`26`	`return err`
`27`	`27`	`}`
`28`		`- if err := writeMetadataFile(name, dirName); err != nil {`
	`28`	`+ var err error`
	`29`	`+ defer func() {`
	`30`	`+ if err != nil {`
	`31`	`+ os.RemoveAll(dirName)`
	`32`	`+ }`
	`33`	`+ }()`
	`34`	`+ if err = writeMetadataFile(name, dirName); err != nil {`
`29`	`35`	`return err`
`30`	`36`	`}`
`31`	`37`
`@@ -35,9 +41,11 @@ func Init(name string, composeFile string) error {`
`35`	`41`	`}`
`36`	`42`	`}`
`37`	`43`	`if composeFile == "" {`
`38`		`- return initFromScratch(name)`
	`44`	`+ err = initFromScratch(name)`
	`45`	`+ } else {`
	`46`	`+ err = initFromComposeFile(name, composeFile)`
`39`	`47`	`}`
`40`		`- return initFromComposeFile(name, composeFile)`
	`48`	`+ return err`
`41`	`49`	`}`
`42`	`50`
`43`	`51`	`func initFromScratch(name string) error {`