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

Merge pull request #859 from AudriusButkevicius/markerfix 

Best attempt when creating a folder marker (fixes #857)
This commit is contained in:
Jakob Borg 2014-10-15 18:06:40 +02:00
parent 86346aa332 6210b9e746
commit d7a0691c99
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/config/config.go
View File

@ -380,10 +380,9 @@ func convertV5V6(cfg *Configuration) {
// Doesn't affect the config itself, but uses config migrations to identify // Doesn't affect the config itself, but uses config migrations to identify
// the migration point. // the migration point.
for _, folder := range Wrap("", *cfg).Folders() { for _, folder := range Wrap("", *cfg).Folders() {
err := folder.CreateMarker() // Best attempt, if it fails, it fails, the user will have to fix
if err != nil { // it up manually, as the repo will not get started.
panic(err) folder.CreateMarker()
}
} }
cfg.Version = 6 cfg.Version = 6