octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-06-04 01:50:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3125 from metalsp0rk/cat-respect-no-lock

Browse Source 
Make restic cat respect --no-lock
This commit is contained in:
Alexander Neumann 2020-11-28 12:45:59 +01:00 committed by GitHub
commit 2f9346a5af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelog/unreleased/issue-2739 Normal file
View File

@ -0,0 +1,5 @@
Bugfix: Make cat command respect --no-lock
Restic cat would not respect the --no-lock flag, it now does.
https://github.com/restic/restic/issues/2739

16
cmd/restic/cmd_cat.go
View File

@ -42,10 +42,18 @@ func runCat(gopts GlobalOptions, args []string) error {
return err
}
lock, err := lockRepo(gopts.ctx, repo)
defer unlockRepo(lock)
if err != nil {
return err
if !gopts.NoLock {
lock, err := lockRepo(gopts.ctx, repo)
if err != nil {
return err
}
defer func() {
err := unlockRepo(lock)
if err != nil {
Warnf("unlock repo failed: %v", err)
}
}()
}
tpe := args[0]