Merge pull request #4514 from grembo/key-list-no-lock
Make `key list` command honor `--no-lock`
This commit is contained in:
commit
17f2301cc2
2 changed files with 15 additions and 4 deletions
8
changelog/unreleased/issue-4513
Normal file
8
changelog/unreleased/issue-4513
Normal file
|
@ -0,0 +1,8 @@
|
|||
Bugfix: Make `key list` command honor `--no-lock`
|
||||
|
||||
This allows to determine which keys a repo can be accessed by without the
|
||||
need for having write access (e.g., read-only sftp access, filesystem
|
||||
snapshot).
|
||||
|
||||
https://github.com/restic/restic/issues/4513
|
||||
https://github.com/restic/restic/pull/4514
|
|
@ -212,10 +212,13 @@ func runKey(ctx context.Context, gopts GlobalOptions, args []string) error {
|
|||
|
||||
switch args[0] {
|
||||
case "list":
|
||||
lock, ctx, err := lockRepo(ctx, repo, gopts.RetryLock, gopts.JSON)
|
||||
defer unlockRepo(lock)
|
||||
if err != nil {
|
||||
return err
|
||||
if !gopts.NoLock {
|
||||
var lock *restic.Lock
|
||||
lock, ctx, err = lockRepo(ctx, repo, gopts.RetryLock, gopts.JSON)
|
||||
defer unlockRepo(lock)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return listKeys(ctx, repo, gopts)
|
||||
|
|
Loading…
Reference in a new issue