ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed versionToInt which would give a higher version number to a rc

Browse Source 
than to the actual release (r8348 on 0.7.1).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8349 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-04-14 05:08:45 +00:00
parent 26ec58b0f1
commit 54dac6c155
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/addons/network_http.cpp
View File

@ -516,11 +516,20 @@ int NetworkHttp::versionToInt(const std::string &version_string)
+ 9; + 9;
std::string s=version_string; std::string s=version_string;
int release_candidate=0; // To guarantee that a release gets a higher version number than
// a release candidate, we assign a 'release_candidate' number
// of 9 to versions which are not a RC. We assert that any RC
// is less than 9 to guarantee the ordering.
int release_candidate=9;
if(sscanf(s.substr(s.length()-4, 4).c_str(), "-rc%d", if(sscanf(s.substr(s.length()-4, 4).c_str(), "-rc%d",
&release_candidate)==1) &release_candidate)==1)
{ {
s = s.substr(0, s.length()-4); s = s.substr(0, s.length()-4);
// Otherwise a RC can get a higher version number than
// the corresponding release! If this should ever get
// triggered, multiply all scaling factors above and
// below by 10, to get two digits for RC numbers.
assert(release_candidate<9);
} }
int very_minor=0; int very_minor=0;
if(s[s.size()-1]>='a' && s[s.size()-1]<='z') if(s[s.size()-1]>='a' && s[s.size()-1]<='z')