Fix false positive in version detection.

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

2 files changed, 2 insertions, 1 deletions

diff --git a/rbutil/rbutilqt/base/rockboxinfo.cpp b/rbutil/rbutilqt/base/rockboxinfo.cpp
index 9d8aba65f9..f9c0ea5b23 100644
--- a/rbutil/rbutilqt/base/rockboxinfo.cpp
+++ b/rbutil/rbutilqt/base/rockboxinfo.cpp
@@ -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.*)");
diff --git a/rbutil/rbutilqt/test/test-rockboxinfo.cpp b/rbutil/rbutilqt/test/test-rockboxinfo.cpp
index 310a0770b3..e7191860d2 100644
--- a/rbutil/rbutilqt/test/test-rockboxinfo.cpp
+++ b/rbutil/rbutilqt/test/test-rockboxinfo.cpp
@@ -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",  "" },
     };