From ce7b09a53379b8dd12427f5faec9ddd1f085068b Mon Sep 17 00:00:00 2001 From: zyllee Date: Wed, 24 May 2023 10:23:26 +0000 Subject: [PATCH] machine/store: modify connect() return value Modified fmt.Errorf() in connect() function. When executing `kraft ps` in user state, error reporting would have a redundant prompt message. Distinguished between basic errors, and the added annotated errors. Signed-off-by: Zeyu Li --- machine/store.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/machine/store.go b/machine/store.go index fec75280a..ada7b2ed6 100644 --- a/machine/store.go +++ b/machine/store.go @@ -38,10 +38,10 @@ import ( "path/filepath" "time" + "github.com/dgraph-io/badger/v3" + "github.com/juju/errors" "kraftkit.sh/config" "kraftkit.sh/internal/retrytimeout" - - "github.com/dgraph-io/badger/v3" ) type MachineStore struct { @@ -109,12 +109,12 @@ func (ms *MachineStore) connect() error { var err error db, err = badger.Open(ms.bopts) if err != nil { - return fmt.Errorf("could not open machine store: %v", err) + return errors.Errorf("%v", err) } return nil }); err != nil { - return fmt.Errorf("could not open machine store: %v", err) + return errors.Annotate(err, "could not open machine store") } ms.db = db