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

Don't create stopped folder in staggered versioning (fixes #1749)

Browse Source
This commit is contained in:
Jakob Borg 2015-05-03 08:20:44 +02:00
parent d1528dcff0
commit 687b249034
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/versioner/staggered.go
View File

@ -95,23 +95,15 @@ func (v Staggered) clean() {
l.Debugln("Versioner clean: Cleaning", v.versionsPath) l.Debugln("Versioner clean: Cleaning", v.versionsPath)
} }
_, err := os.Stat(v.versionsPath) if _, err := os.Stat(v.versionsPath); os.IsNotExist(err) {
if err != nil { // There is no need to clean a nonexistent dir.
if os.IsNotExist(err) { return
if debug {
l.Debugln("creating versions dir", v.versionsPath)
}
os.MkdirAll(v.versionsPath, 0755)
osutil.HideFile(v.versionsPath)
} else {
l.Warnln("Versioner: can't create versions dir", err)
}
} }
versionsPerFile := make(map[string][]string) versionsPerFile := make(map[string][]string)
filesPerDir := make(map[string]int) filesPerDir := make(map[string]int)
err = filepath.Walk(v.versionsPath, func(path string, f os.FileInfo, err error) error { err := filepath.Walk(v.versionsPath, func(path string, f os.FileInfo, err error) error {
if err != nil { if err != nil {
return err return err
} }
@ -165,6 +157,7 @@ func (v Staggered) clean() {
l.Warnln("Versioner: can't remove directory", path, err) l.Warnln("Versioner: can't remove directory", path, err)
} }
} }
if debug { if debug {
l.Debugln("Cleaner: Finished cleaning", v.versionsPath) l.Debugln("Cleaner: Finished cleaning", v.versionsPath)
} }