bugfix for version checking
We can have versions with only one dot.
This commit is contained in:
parent
7680372c89
commit
f4529566fa
|
@ -793,6 +793,7 @@ int compareMajorMinorVersion(string versionA,string versionB) {
|
||||||
int majorB = getMajor(versionB);
|
int majorB = getMajor(versionB);
|
||||||
int minorB = getMinor(versionB);
|
int minorB = getMinor(versionB);
|
||||||
|
|
||||||
|
//printf("majorA:%d minorA:%d majorB:%d minorB:%d\n",majorA,minorA,majorB,minorB);
|
||||||
if(majorA < majorB) {
|
if(majorA < majorB) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -815,7 +816,7 @@ int compareMajorMinorVersion(string versionA,string versionB) {
|
||||||
int getMajor(string version) {
|
int getMajor(string version) {
|
||||||
vector<string> parts = split(version.substr(1),".");
|
vector<string> parts = split(version.substr(1),".");
|
||||||
|
|
||||||
if(parts.size() > 2 && parts[0] != "" && IsNumeric(parts[0].c_str(),false)) {
|
if(parts.size() > 1 && parts[0] != "" && IsNumeric(parts[0].c_str(),false)) {
|
||||||
return strToInt(parts[0]);
|
return strToInt(parts[0]);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -825,7 +826,7 @@ int getMajor(string version) {
|
||||||
|
|
||||||
int getMinor(string version) {
|
int getMinor(string version) {
|
||||||
vector<string> parts = split(version.substr(1),".");
|
vector<string> parts = split(version.substr(1),".");
|
||||||
if(parts.size() > 2 && parts[1] != "") {
|
if(parts.size() > 1 && parts[1] != "") {
|
||||||
string resultStr="";
|
string resultStr="";
|
||||||
for (int i = 0; i < (int)parts[1].length(); ++i) {
|
for (int i = 0; i < (int)parts[1].length(); ++i) {
|
||||||
// just add leading numbers
|
// just add leading numbers
|
||||||
|
|
Loading…
Reference in New Issue
Block a user