octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-22 12:55:18 +00:00
Code Issues Releases Wiki Activity

[issue 3464] skip lock creation in case of dry-run

Browse Source
This commit is contained in:
Pavel Frolov 2022-01-08 14:58:06 +03:00
parent 2ff3b7d69c
commit 792523b28b
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
changelog/unreleased/issue-3464 Normal file
View File

@ -0,0 +1,9 @@
Enhancement: Skip lock creation on forget if --no-lock and --dry-run
Restic used to silently ignore --no-lock option of forget. It now skips
creation of lock file in case of both --dry-run and --no-lock are specified. If
--no-lock option is specified without --dry-run then restic prints a warning
message to stderr.
https://github.com/restic/restic/issues/3464
https://github.com/restic/restic/pull/3623

15
cmd/restic/cmd_forget.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"io" "io"
"github.com/restic/restic/internal/errors"
"github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/restic"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -108,10 +109,16 @@ func runForget(opts ForgetOptions, gopts GlobalOptions, args []string) error {
return err return err
} }
lock, err := lockRepoExclusive(gopts.ctx, repo) if gopts.NoLock && !opts.DryRun {
defer unlockRepo(lock) return errors.Fatal("--no-lock is only applicable in combination with --dry-run for forget command")
if err != nil { }
return err
if !opts.DryRun || !gopts.NoLock {
lock, err := lockRepoExclusive(gopts.ctx, repo)
defer unlockRepo(lock)
if err != nil {
return err
}
} }
ctx, cancel := context.WithCancel(gopts.ctx) ctx, cancel := context.WithCancel(gopts.ctx)