Fix download errors not handled during core installation (#1217)

ubergesundheit · web-flow · commit b7f3dae4e303 · 2021-03-15T15:17:41.000+01:00
diff --git a/commands/core/install.go b/commands/core/install.go
@@ -91,7 +91,10 @@ func installPlatform(pm *packagemanager.PackageManager,
 			return err
 		}
 	}
-	downloadPlatform(pm, platformRelease, downloadCB)
+	err := downloadPlatform(pm, platformRelease, downloadCB)
+	if err != nil {
+		return err
+	}
 	taskCB(&rpc.TaskProgress{Completed: true})
 
 	// Install tools first
@@ -114,7 +117,7 @@ func installPlatform(pm *packagemanager.PackageManager,
 	}
 
 	// Install
-	err := pm.InstallPlatform(platformRelease)
+	err = pm.InstallPlatform(platformRelease)
 	if err != nil {
 		log.WithError(err).Error("Cannot install platform")
 		return err

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,10 @@ func installPlatform(pm *packagemanager.PackageManager,`
`91`	`91`	`return err`
`92`	`92`	`}`
`93`	`93`	`}`
`94`		`- downloadPlatform(pm, platformRelease, downloadCB)`
	`94`	`+ err := downloadPlatform(pm, platformRelease, downloadCB)`
	`95`	`+ if err != nil {`
	`96`	`+ return err`
	`97`	`+ }`
`95`	`98`	`taskCB(&rpc.TaskProgress{Completed: true})`
`96`	`99`
`97`	`100`	`// Install tools first`
`@@ -114,7 +117,7 @@ func installPlatform(pm *packagemanager.PackageManager,`
`114`	`117`	`}`
`115`	`118`
`116`	`119`	`// Install`
`117`		`- err := pm.InstallPlatform(platformRelease)`
	`120`	`+ err = pm.InstallPlatform(platformRelease)`
`118`	`121`	`if err != nil {`
`119`	`122`	`log.WithError(err).Error("Cannot install platform")`
`120`	`123`	`return err`