Fix compatibility with the latest version of ek package

essentialkaos · Oct 21, 2024 · d2110bd · d2110bd
1 parent 9206648
commit d2110bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cli/cli.go b/cli/cli.go
@@ -118,7 +118,7 @@ func Run(gitRev string, gomod []byte) {
 
 	if !errs.IsEmpty() {
 		terminal.Error("Options parsing errors:")
-		terminal.Error(errs.String())
+		terminal.Error(errs.Error("- "))
 		os.Exit(1)
 	}
 

diff --git a/cli/executor/executor.go b/cli/executor/executor.go
@@ -16,7 +16,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/essentialkaos/ek/v13/errutil"
+	"github.com/essentialkaos/ek/v13/errors"
 	"github.com/essentialkaos/ek/v13/fmtc"
 	"github.com/essentialkaos/ek/v13/fmtutil/panel"
 	"github.com/essentialkaos/ek/v13/fsutil"
@@ -162,7 +162,7 @@ func NewExecutor(cfg *Config) *Executor {
 
 // Validate validates recipe
 func (e *Executor) Validate(r *recipe.Recipe, cfg *ValidationConfig) []error {
-	errs := errutil.NewErrors()
+	errs := errors.NewBundle()
 
 	errs.Add(checkRecipeWorkingDir(r))
 	errs.Add(checkRecipeTags(r, cfg.Tags))
@@ -180,7 +180,7 @@ func (e *Executor) Validate(r *recipe.Recipe, cfg *ValidationConfig) []error {
 		errs.Add(checkDependencies(r))
 	}
 
-	if !errs.HasErrors() {
+	if errs.IsEmpty() {
 		return nil
 	}