community
/
rclone
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache: fix error return value of cache/fetch rc method

This commit is contained in:
Fabian Möller 2018-09-03 17:07:07 +02:00
parent a4c4019032
commit deda093637
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/cache/cache.go vendored
View File

@ -666,7 +666,7 @@ func (f *Fs) rcFetch(in rc.Params) (rc.Params, error) {
}
}
type fileStatus struct {
Error error
Error string
FetchedChunks int
}
fetchedChunks := make(map[string]fileStatus, len(files))
@ -675,13 +675,13 @@ func (f *Fs) rcFetch(in rc.Params) (rc.Params, error) {
var status fileStatus
o, err := f.NewObject(remote)
if err != nil {
status.Error = err
fetchedChunks[file] = fileStatus{Error: err.Error()}
continue
}
co := o.(*Object)
err = co.refreshFromSource(true)
if err != nil {
status.Error = err
fetchedChunks[file] = fileStatus{Error: err.Error()}
continue
}
handle := NewObjectHandle(co, f)
@ -690,8 +690,8 @@ func (f *Fs) rcFetch(in rc.Params) (rc.Params, error) {
walkChunkRanges(crs, co.Size(), func(chunk int64) {
_, err := handle.getChunk(chunk * f.ChunkSize())
if err != nil {
if status.Error == nil {
status.Error = err
if status.Error == "" {
status.Error = err.Error()
}
} else {
status.FetchedChunks++