From 67761d8795e88cbb687ef334a8bb3a215fc5b76f Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Fri, 18 Sep 2020 08:11:48 +0200 Subject: [PATCH] cmd/ursrv: Properly sort versions (fixes #6991) --- cmd/ursrv/main.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/ursrv/main.go b/cmd/ursrv/main.go index d023a526f..b9661f222 100644 --- a/cmd/ursrv/main.go +++ b/cmd/ursrv/main.go @@ -28,6 +28,7 @@ import ( "github.com/oschwald/geoip2-golang" + "github.com/syncthing/syncthing/lib/upgrade" "github.com/syncthing/syncthing/lib/ur/contract" ) @@ -978,7 +979,9 @@ func (s *summary) MarshalJSON() ([]byte, error) { for v := range s.versions { versions = append(versions, v) } - sort.Strings(versions) + sort.Slice(versions, func(a, b int) bool { + return upgrade.CompareVersions(versions[a], versions[b]) < 0 + }) var filtered []string for _, v := range versions {