Merge pull request #3665 from MichaelEischer/sane-list-locks

list: Never lock the repository when listing lock files
This commit is contained in:
Alexander Neumann 2022-03-21 11:14:44 +01:00 committed by GitHub
commit ca1e2316cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

View file

@ -0,0 +1,10 @@
Bugfix: Never lock repository for `list locks`
The `list locks` command previously locked to the repository by default. This
has the problem that it won't work for an exclusively locked repository and
that the command will also display its own lock file which can be confusing.
Now, the `list locks` command never locks the repository.
https://github.com/restic/restic/issues/1106
https://github.com/restic/restic/pull/3665

View file

@ -39,7 +39,7 @@ func runList(cmd *cobra.Command, opts GlobalOptions, args []string) error {
return err
}
if !opts.NoLock {
if !opts.NoLock && args[0] != "locks" {
lock, err := lockRepo(opts.ctx, repo)
defer unlockRepo(lock)
if err != nil {