diff --git a/lib/config/config.go b/lib/config/config.go index 10a4f6470..5d98e0b1f 100644 --- a/lib/config/config.go +++ b/lib/config/config.go @@ -23,7 +23,7 @@ import ( const ( OldestHandledVersion = 10 - CurrentVersion = 13 + CurrentVersion = 14 MaxRescanIntervalS = 365 * 24 * 60 * 60 ) @@ -198,6 +198,9 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) { if cfg.Version == 12 { convertV12V13(cfg) } + if cfg.Version == 13 { + convertV13V14(cfg) + } // Build a list of available devices existingDevices := make(map[protocol.DeviceID]bool) @@ -251,7 +254,7 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) { } } -func convertV12V13(cfg *Configuration) { +func convertV13V14(cfg *Configuration) { // Not using the ignore cache is the new default. Disable it on existing // configurations. cfg.Options.CacheIgnoredFiles = false @@ -300,6 +303,10 @@ func convertV12V13(cfg *Configuration) { cfg.Folders[i].DeprecatedReadOnly = false } + cfg.Version = 14 +} + +func convertV12V13(cfg *Configuration) { if cfg.Options.ReleasesURL == "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30" { cfg.Options.ReleasesURL = "https://upgrades.syncthing.net/meta.json" } diff --git a/lib/config/testdata/overridenvalues.xml b/lib/config/testdata/overridenvalues.xml index 06fd7f901..166e6638c 100755 --- a/lib/config/testdata/overridenvalues.xml +++ b/lib/config/testdata/overridenvalues.xml @@ -1,4 +1,4 @@ - + tcp://:23000 false diff --git a/lib/config/testdata/v13.xml b/lib/config/testdata/v13.xml index 45dabe041..1fec6e1bd 100644 --- a/lib/config/testdata/v13.xml +++ b/lib/config/testdata/v13.xml @@ -1,5 +1,5 @@ - + 1 diff --git a/lib/config/testdata/v14.xml b/lib/config/testdata/v14.xml new file mode 100644 index 000000000..31cca4ae0 --- /dev/null +++ b/lib/config/testdata/v14.xml @@ -0,0 +1,14 @@ + + + + + 1 + -1 + + +
tcp://a
+
+ +
tcp://b
+
+