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

Fix failing integration tests

Browse Source
This commit is contained in:
Audrius Butkevicius 2015-02-01 18:57:46 +00:00
parent ec82b0c648
commit 8358fedaf4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/syncthing/main.go
View File

@ -874,8 +874,10 @@ func resetFolders() {
suffix := fmt.Sprintf(".syncthing-reset-%d", time.Now().UnixNano()) suffix := fmt.Sprintf(".syncthing-reset-%d", time.Now().UnixNano())
for _, folder := range cfg.Folders() { for _, folder := range cfg.Folders() {
if _, err := os.Stat(folder.Path); err == nil { if _, err := os.Stat(folder.Path); err == nil {
l.Infof("Reset: Moving %s -> %s", folder.Path, folder.Path+suffix) base := filepath.Base(folder.Path)
os.Rename(folder.Path, folder.Path+suffix) dir := filepath.Dir(filepath.Join(folder.Path, ".."))
l.Infof("Reset: Moving %s -> %s", folder.Path, filepath.Join(dir, base+suffix))
os.Rename(folder.Path, filepath.Join(dir, base+suffix))
} }
} }