Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix false positive in version detection.

Browse source 
Some git revisions are falsely detected as release version. Extend test and fix
the wrong regexp. Corrects font download trying to get the wrong file for some
current builds.

Change-Id: Ia779896c927385ec0d7ba68ee3d953f3c6e4494c
This commit is contained in:
Dominik Riebeling 2012-03-12 22:16:14 +01:00
parent 93cf878a48
commit 674bbbaf83
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rbutil/rbutilqt/base/rockboxinfo.cpp
View file

@ -35,7 +35,7 @@ RockboxInfo::RockboxInfo(QString mountpoint, QString fname)
// read file contents
QRegExp hash("^Version:\\s+(r?)([0-9a-fM]+)");
QRegExp version("^Version:\\s+(\\S.*)");
QRegExp release("^Version:\\s+([0-9\\.]+)");
QRegExp release("^Version:\\s+([0-9\\.]+)\\s*$");
QRegExp target("^Target:\\s+(\\S.*)");
QRegExp features("^Features:\\s+(\\S.*)");
QRegExp targetid("^Target id:\\s+(\\S.*)");

1
rbutil/rbutilqt/test/test-rockboxinfo.cpp
View file

@ -54,6 +54,7 @@ void TestRockboxInfo::testVersion()
{ "Version: e5b1b0f-120218", "e5b1b0f", "e5b1b0f-120218", "" },
{ "Version: e5b1b0fM-120218", "e5b1b0fM", "e5b1b0fM-120218", "" },
{ "#Version: e5b1b0f-120218", "", "", "" },
{ "Version: 3448f5b-120310", "3448f5b", "3448f5b-120310", "" },
};