From ea8b247bab1c58aba213d6dcebeb2bfdeef0ae06 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 20 Aug 2020 16:42:15 +0200 Subject: [PATCH 1/3] Changed core install message --- commands/core/install.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/core/install.go b/commands/core/install.go index b7dfc10d77d..fc7500de093 100644 --- a/commands/core/install.go +++ b/commands/core/install.go @@ -142,13 +142,13 @@ func installPlatform(pm *packagemanager.PackageManager, // Perform post install if !skipPostInstall { log.Info("Running post_install script") - taskCB(&rpc.TaskProgress{Message: "Configuring platform (post_install run)"}) + taskCB(&rpc.TaskProgress{Message: "Configuring platform"}) if err := pm.RunPostInstallScript(platformRelease); err != nil { return errors.Errorf("running post install: %s", err) } } else if skipPostInstall { log.Info("Skipping platform configuration (post_install run).") - taskCB(&rpc.TaskProgress{Message: "Skipping platform configuration (post_install run)"}) + taskCB(&rpc.TaskProgress{Message: "Skipping platform configuration"}) } log.Info("Platform installed") From a8fdb317c7c5347087ecaf213bb7f1cc0cb188d1 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 20 Aug 2020 16:43:21 +0200 Subject: [PATCH 2/3] Removed useless condition (letfover) --- commands/core/install.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/core/install.go b/commands/core/install.go index fc7500de093..1ea8d25a40b 100644 --- a/commands/core/install.go +++ b/commands/core/install.go @@ -146,7 +146,7 @@ func installPlatform(pm *packagemanager.PackageManager, if err := pm.RunPostInstallScript(platformRelease); err != nil { return errors.Errorf("running post install: %s", err) } - } else if skipPostInstall { + } else { log.Info("Skipping platform configuration (post_install run).") taskCB(&rpc.TaskProgress{Message: "Skipping platform configuration"}) } From a9c241f22214d5f97c3e2a7957b92890a1054181 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 20 Aug 2020 16:53:11 +0200 Subject: [PATCH 3/3] Convert errors running post_install into warnings --- commands/core/install.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/core/install.go b/commands/core/install.go index 1ea8d25a40b..dc8d761f696 100644 --- a/commands/core/install.go +++ b/commands/core/install.go @@ -144,7 +144,7 @@ func installPlatform(pm *packagemanager.PackageManager, log.Info("Running post_install script") taskCB(&rpc.TaskProgress{Message: "Configuring platform"}) if err := pm.RunPostInstallScript(platformRelease); err != nil { - return errors.Errorf("running post install: %s", err) + taskCB(&rpc.TaskProgress{Message: fmt.Sprintf("WARNING: cannot run post install: %s", err)}) } } else { log.Info("Skipping platform configuration (post_install run).")