Browse Source

Fix equal short-long version number comparison

Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
lalyos 11 years ago
parent
commit
58ef92f89e
1 changed files with 10 additions and 5 deletions
  1. 10 5
      pkg/version/version.go

+ 10 - 5
pkg/version/version.go

@@ -12,9 +12,17 @@ func (me Version) compareTo(other Version) int {
 		meTab    = strings.Split(string(me), ".")
 		meTab    = strings.Split(string(me), ".")
 		otherTab = strings.Split(string(other), ".")
 		otherTab = strings.Split(string(other), ".")
 	)
 	)
-	for i, s := range meTab {
+
+	max := len(meTab)
+	if len(otherTab) > max {
+		max = len(otherTab)
+	}
+	for i := 0; i < max; i++ {
 		var meInt, otherInt int
 		var meInt, otherInt int
-		meInt, _ = strconv.Atoi(s)
+
+		if len(meTab) > i {
+			meInt, _ = strconv.Atoi(meTab[i])
+		}
 		if len(otherTab) > i {
 		if len(otherTab) > i {
 			otherInt, _ = strconv.Atoi(otherTab[i])
 			otherInt, _ = strconv.Atoi(otherTab[i])
 		}
 		}
@@ -25,9 +33,6 @@ func (me Version) compareTo(other Version) int {
 			return -1
 			return -1
 		}
 		}
 	}
 	}
-	if len(otherTab) > len(meTab) {
-		return -1
-	}
 	return 0
 	return 0
 }
 }