Fix problems with platform retrieval.

- handle disabled platforms also for for variant and base groups.
- make variant detection more strict to prevent variants that are a substring
  of other variants to match. Happened e.g. for iriverh10 and iriverh100.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24625 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 2 deletions

diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp
index e581e952ac..0151273338 100644
--- a/rbutil/rbutilqt/base/serverinfo.cpp
+++ b/rbutil/rbutilqt/base/serverinfo.cpp
@@ -54,13 +54,13 @@ void ServerInfo::readBuildInfo(QString file)
     info.endGroup();
 
     // get base platforms, handle variants with platforms in the loop
-    QStringList platforms = SystemInfo::platforms(SystemInfo::PlatformBase);
+    QStringList platforms = SystemInfo::platforms(SystemInfo::PlatformBaseDisabled);
     for(int i = 0; i < platforms.size(); i++)
     {
         // check if there are rbutil-variants of the current platform and handle
         // them the same time.
         QStringList variants;
-        variants = SystemInfo::platforms(SystemInfo::PlatformVariant, platforms.at(i));
+        variants = SystemInfo::platforms(SystemInfo::PlatformVariantDisabled, platforms.at(i));
         QVariant release;
         info.beginGroup("release");
         if(keys.contains(platforms.at(i))) {