perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly handle read-write/read-only windows<->posix (fixes #236)

Browse Source
This commit is contained in:
Jakob Borg
2014-05-19 23:42:08 +02:00
parent dba40eefb1
commit e359b146aa
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
model/puller.go
View File

@@ -525,19 +525,29 @@ func (p *puller) handleEmptyBlock(b bqBlock) {
l.Debugf("pull: delete %q", f.Name)
}
os.Remove(of.temp)
os.Remove(of.filepath)
os.Chmod(of.filepath, 0666)
if os.Remove(of.filepath) == nil {
p.model.updateLocal(p.repo, f)
}
} else {
if debug {
l.Debugf("pull: no blocks to fetch and nothing to copy for %q / %q", p.repo, f.Name)
}
t := time.Unix(f.Modified, 0)
os.Chtimes(of.temp, t, t)
os.Chmod(of.temp, os.FileMode(f.Flags&0777))
if os.Chtimes(of.temp, t, t) != nil {
delete(p.openFiles, f.Name)
return
}
if os.Chmod(of.temp, os.FileMode(f.Flags&0777)) != nil {
delete(p.openFiles, f.Name)
return
}
defTempNamer.Show(of.temp)
Rename(of.temp, of.filepath)
if Rename(of.temp, of.filepath) == nil {
p.model.updateLocal(p.repo, f)
}
}
delete(p.openFiles, f.Name)
p.model.updateLocal(p.repo, f)
}
func (p *puller) queueNeededBlocks() {