diff options
| author | Jakob Borg <jakob@nym.se> | 2016-05-13 14:13:24 +0000 |
|---|---|---|
| committer | Jakob Borg <jakob@nym.se> | 2016-05-13 14:13:24 +0000 |
| commit | 5d2414dfa92cdcbcb55acb8b5d238482af964ec8 (patch) | |
| tree | 5ce2bc11257753ff7f7295cba7a8470f4659def2 | |
| parent | bef24250254c833a48f021a461928f927c4893ee (diff) | |
lib/config: Bump config version to 14
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3092
| -rw-r--r-- | lib/config/config.go | 11 | ||||
| -rwxr-xr-x | lib/config/testdata/overridenvalues.xml | 2 | ||||
| -rw-r--r-- | lib/config/testdata/v13.xml | 2 | ||||
| -rw-r--r-- | lib/config/testdata/v14.xml | 14 |
4 files changed, 25 insertions, 4 deletions
diff --git a/lib/config/config.go b/lib/config/config.go index 10a4f64709..5d98e0b1f9 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 06fd7f9015..166e6638c9 100755 --- a/lib/config/testdata/overridenvalues.xml +++ b/lib/config/testdata/overridenvalues.xml @@ -1,4 +1,4 @@ -<configuration version="13"> +<configuration version="14"> <options> <listenAddress>tcp://:23000</listenAddress> <allowDelete>false</allowDelete> diff --git a/lib/config/testdata/v13.xml b/lib/config/testdata/v13.xml index 45dabe041d..1fec6e1bd7 100644 --- a/lib/config/testdata/v13.xml +++ b/lib/config/testdata/v13.xml @@ -1,5 +1,5 @@ <configuration version="13"> - <folder id="test" path="testdata" type="readonly" ignorePerms="false" rescanIntervalS="600" autoNormalize="true"> + <folder id="test" path="testdata" ro="true" ignorePerms="false" rescanIntervalS="600" autoNormalize="true"> <device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR"></device> <device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2"></device> <minDiskFreePct>1</minDiskFreePct> diff --git a/lib/config/testdata/v14.xml b/lib/config/testdata/v14.xml new file mode 100644 index 0000000000..31cca4ae08 --- /dev/null +++ b/lib/config/testdata/v14.xml @@ -0,0 +1,14 @@ +<configuration version="14"> + <folder id="test" path="testdata" type="readonly" ignorePerms="false" rescanIntervalS="600" autoNormalize="true"> + <device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR"></device> + <device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2"></device> + <minDiskFreePct>1</minDiskFreePct> + <maxConflicts>-1</maxConflicts> + </folder> + <device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" name="node one" compression="metadata"> + <address>tcp://a</address> + </device> + <device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" name="node two" compression="metadata"> + <address>tcp://b</address> + </device> +</configuration> |