octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-08 22:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace directories/links with files (fixes #580)

Browse Source
This commit is contained in:
Audrius Butkevicius 2014-11-17 11:25:32 +00:00
parent ba019efaf1
commit 37ebbb53be
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/model/puller.go
View File

@ -370,12 +370,13 @@ func (p *Puller) handleDir(file protocol.FileInfo) {
l.Debugf("need dir\n\t%v\n\t%v", file, curFile)
}
info, err := os.Stat(realName)
info, err := os.Lstat(realName)
isLink, _ := symlinks.IsSymlink(realName)
switch {
// There is already something under that name, but it's a file.
// Most likely a file is getting replaced with a directory.
// Remove the file and fall through to directory creation.
case err == nil && !info.IsDir():
// There is already something under that name, but it's a file/link.
// Most likely a file/link is getting replaced with a directory.
// Remove the file/link and fall through to directory creation.
case isLink || (err == nil && !info.IsDir()):
err = osutil.InWritableDir(os.Remove, realName)
if err != nil {
l.Infof("Puller (folder %q, dir %q): %v", p.folder, file.Name, err)
@ -795,7 +796,14 @@ func (p *Puller) finisherRoutine(in <-chan *sharedPullerState) {
}
}
// Replace the original file with the new one
// If the target path is a symlink or a directory, we cannot copy
// over it, hence remove it before proceeding.
stat, err := os.Lstat(state.realName)
isLink, _ := symlinks.IsSymlink(state.realName)
if isLink || (err == nil && stat.IsDir()) {
osutil.InWritableDir(os.Remove, state.realName)
}
// Replace the original content with the new one
err = osutil.Rename(state.tempName, state.realName)
if err != nil {
l.Warnln("puller: final:", err)

2
test/filetype_test.go
View File

@ -16,7 +16,7 @@
// +build integration
// This currently fails; it should be fixed
package integration_test_disabled
package integration_test
import (
"log"

6
test/symlink_test.go
View File

@ -191,8 +191,6 @@ func TestSymlinks(t *testing.T) {
}
fd.Close()
/* Currently fails, to be fixed with #80
// Replace one with a directory
err = os.Remove("s1/repDirLink")
@ -204,7 +202,6 @@ func TestSymlinks(t *testing.T) {
if err != nil {
log.Fatal(err)
}
*/
// Replace a file with a symlink
@ -217,8 +214,6 @@ func TestSymlinks(t *testing.T) {
log.Fatal(err)
}
/* Currently fails, to be fixed with #80
// Replace a directory with a symlink
err = os.RemoveAll("s1/dirToReplace")
@ -229,7 +224,6 @@ func TestSymlinks(t *testing.T) {
if err != nil {
log.Fatal(err)
}
*/
// Sync these changes and recheck