github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-23 14:38:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

local: work on spurious "can't copy - source file is being updated" errors #2206

Browse Source 
Update all the time comparisons to use time.Time.Equal instead of ==

Improve the logging for that error so we can see exactly what has changed
This commit is contained in:
Nick Craig-Wood 2018-04-04 17:12:30 +01:00
parent 6e11a25df5
commit c4531daa43
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/local/local.go
View File

@ -421,7 +421,7 @@ func (f *Fs) readPrecision() (precision time.Duration) {
// If it matches - have found the precision
// fmt.Println("compare", fi.ModTime(), t)
if fi.ModTime() == t {
if fi.ModTime().Equal(t) {
// fmt.Println("Precision detected as", duration)
return duration
}
@ -678,8 +678,11 @@ func (file *localOpenFile) Read(p []byte) (n int, err error) {
if err != nil {
return 0, errors.Wrap(err, "can't read status of source file while transferring")
}
if file.o.size != fi.Size() || file.o.modTime != fi.ModTime() {
return 0, errors.New("can't copy - source file is being updated")
if file.o.size != fi.Size() {
return 0, errors.Errorf("can't copy - source file is being updated (size changed from %d to %d)", file.o.size, fi.Size())
}
if !file.o.modTime.Equal(fi.ModTime()) {
return 0, errors.Errorf("can't copy - source file is being updated (mod time changed from %v to %v)", file.o.modTime, fi.ModTime())
}
n, err = file.in.Read(p)