github-mirror/rclone
github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-02-22 23:45:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

sync: Fix log message containing <nil>

Browse Source
This commit is contained in:
Nick Craig-Wood 2017-02-13 09:23:21 +00:00
parent 18c75a81f9
commit 7047c67a5e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/sync.go
View File

@ -941,12 +941,12 @@ func (s *syncCopyMove) transfer(dst, src BasicInfo, job listDirJob, jobs *[]list
} else { } else {
// FIXME src is file, dst is directory // FIXME src is file, dst is directory
err := errors.New("can't overwrite directory with file") err := errors.New("can't overwrite directory with file")
Errorf(srcX, "%v", err) Errorf(dst, "%v", err)
s.processError(err) s.processError(err)
} }
case *Dir: case *Dir:
// Do the same thing to the entire contents of the directory // Do the same thing to the entire contents of the directory
dstX, ok := dst.(*Dir) _, ok := dst.(*Dir)
if ok { if ok {
if job.srcDepth > 0 && job.dstDepth > 0 { if job.srcDepth > 0 && job.dstDepth > 0 {
*jobs = append(*jobs, listDirJob{ *jobs = append(*jobs, listDirJob{
@ -958,7 +958,7 @@ func (s *syncCopyMove) transfer(dst, src BasicInfo, job listDirJob, jobs *[]list
} else { } else {
// FIXME src is dir, dst is file // FIXME src is dir, dst is file
err := errors.New("can't overwrite file with directory") err := errors.New("can't overwrite file with directory")
Errorf(dstX, "%v", err) Errorf(dst, "%v", err)
s.processError(err) s.processError(err)
} }
default: default: