Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2525 from kluppy/master 

Don't chmod in Atomic on android (fixes  #2472)
This commit is contained in:
Jakob Borg 2015-11-28 22:57:00 +01:00
parent f0c8b7ce40 f062e35641
commit 1ebc9a9a88
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/osutil/atomic.go
View File

@ -37,10 +37,13 @@ func CreateAtomic(path string, mode os.FileMode) (*AtomicWriter, error) {
return nil, err return nil, err
} }
if err := os.Chmod(fd.Name(), mode); err != nil { // chmod fails on Android so don't even try
fd.Close() if runtime.GOOS != "android" {
os.Remove(fd.Name()) if err := os.Chmod(fd.Name(), mode); err != nil {
return nil, err fd.Close()
os.Remove(fd.Name())
return nil, err
}
} }
w := &AtomicWriter{ w := &AtomicWriter{