From 64515c4a6e12cb90e2b2350c9c845dc04bb4a0cd Mon Sep 17 00:00:00 2001 From: garethgeorge Date: Sat, 17 Feb 2024 01:47:03 -0800 Subject: [PATCH] fix: improve error message when rclone config is missing --- pkg/restic/restic.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/restic/restic.go b/pkg/restic/restic.go index ff8adb89..88929e36 100644 --- a/pkg/restic/restic.go +++ b/pkg/restic/restic.go @@ -118,6 +118,7 @@ func (r *Repo) Backup(ctx context.Context, progressCallback func(*BackupProgress cmd := exec.CommandContext(ctx, r.cmd, args...) cmd.Env = append(cmd.Env, r.buildEnv()...) + cmd.StdoutPipe() cmd.Stderr = capture cmd.Stdout = capture @@ -185,7 +186,7 @@ func (r *Repo) Snapshots(ctx context.Context, opts ...GenericOption) ([]*Snapsho var snapshots []*Snapshot if err := json.Unmarshal(output, &snapshots); err != nil { - return nil, newCmdError(cmd, "", fmt.Errorf("command output is not valid JSON: %w", err)) + return nil, newCmdError(cmd, string(output), fmt.Errorf("command output is not valid JSON: %w", err)) } for _, snapshot := range snapshots { if err := snapshot.Validate(); err != nil {