TrueCloudLab/restic
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

check: Use --cache-dir argument

Browse source 
Closes #1880
This commit is contained in:
Garry McNulty 2018-07-20 20:51:20 +01:00
parent 67535e00a8
commit f1f69bc648
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
changelog/unreleased/issue-1880 Normal file
View file

@ -0,0 +1,7 @@
Bugfix: Use `--cache-dir` argument for `check` command
`check` command now uses a specific cache directory if set using the `--cache-dir` argument.
The `--cache-dir` argument was not used by the `check` command, instead a cache directory was created in the temporary directory.
https://github.com/restic/restic/issues/1880

6
cmd/restic/cmd_check.go
View file

@ -122,6 +122,7 @@ func newReadProgress(gopts GlobalOptions, todo restic.Stat) *restic.Progress {
// prepareCheckCache configures a special cache directory for check. // prepareCheckCache configures a special cache directory for check.
// //
// * if --with-cache is specified, the default cache is used // * if --with-cache is specified, the default cache is used
// * if the user provides --cache-dir, the specified directory is used
// * if the user explicitly requested --no-cache, we don't use any cache // * if the user explicitly requested --no-cache, we don't use any cache
// * by default, we use a cache in a temporary directory that is deleted after the check // * by default, we use a cache in a temporary directory that is deleted after the check
func prepareCheckCache(opts CheckOptions, gopts *GlobalOptions) (cleanup func()) { func prepareCheckCache(opts CheckOptions, gopts *GlobalOptions) (cleanup func()) {
@ -131,6 +132,11 @@ func prepareCheckCache(opts CheckOptions, gopts *GlobalOptions) (cleanup func())
return cleanup return cleanup
} }
if gopts.CacheDir != "" {
// use the specified cache directory, no setup needed
return cleanup
}
if gopts.NoCache { if gopts.NoCache {
// don't use any cache, no setup needed // don't use any cache, no setup needed
return cleanup return cleanup