Merge pull request docker#4128 from StefanScherer/fix-versioncmp

Fix versioncmp for CE edition
daparm · Jun 30, 2017 · 255980c · 255980c
2 parents c604d46 + efe0ca5
commit 255980c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libmachine/versioncmp/compare.go b/libmachine/versioncmp/compare.go
@@ -29,10 +29,10 @@ func compare(v1, v2 string) int {
 	// presence of the "ce" string in the version string) are "less than"
 	// any community edition release (first occuring in March 2017).
 	if strings.Contains(v1, ceEdition) && !strings.Contains(v2, ceEdition) {
-		return -1
+		return 1
 	}
 	if !strings.Contains(v1, ceEdition) && strings.Contains(v2, ceEdition) {
-		return 1
+		return -1
 	}
 
 	// Without this tag, both are pre-CE versions.

diff --git a/libmachine/versioncmp/compare_test.go b/libmachine/versioncmp/compare_test.go
@@ -33,6 +33,8 @@ func TestCompare(t *testing.T) {
 		{"17.03.0-ce", "17.06.0-ce", -1},
 		{"17.03.0-ce-rc2", "17.03.0-ce-rc1", 1},
 		{"17.03.0-ce-rc1", "18.03.0-ce-rc1", -1},
+		{"17.06.0-ce-rc2", "1.12.0", 1},
+		{"1.12.0", "17.06.0-ce-rc2", -1},
 	}
 
 	for _, tc := range cases {