Read release candidate information from build-info.

Change-Id: I73ac0922f25dd247588f945eba1e78f4026d747d

2 files changed, 21 insertions, 0 deletions

diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp
index 4abaeb2aa7..eef7b1bdfe 100644
--- a/rbutil/rbutilqt/base/serverinfo.cpp
+++ b/rbutil/rbutilqt/base/serverinfo.cpp
@@ -32,6 +32,8 @@ const static struct {
 } ServerInfoList[] = {
     { ServerInfo::CurReleaseVersion,    ":platform:/releaseversion", "" },
     { ServerInfo::CurReleaseUrl,        ":platform:/releaseurl",     "" },
+    { ServerInfo::RelCandidateVersion,  ":platform:/rcversion",      "" },
+    { ServerInfo::RelCandidateUrl,      ":platform:/rcurl",          "" },
     { ServerInfo::CurStatus,            ":platform:/status",         "Unknown" },
     { ServerInfo::BleedingRevision,     "bleedingrev",               "" },
     { ServerInfo::BleedingDate,         "bleedingdate",              "" },
@@ -67,6 +69,8 @@ void ServerInfo::readBuildInfo(QString file)
         variants = SystemInfo::platforms(SystemInfo::PlatformVariantDisabled, platforms.at(i));
         QString releaseVersion;
         QString releaseUrl;
+        QString relCandidateVersion;
+        QString relCandidateUrl;
         info.beginGroup("release");
         if(keys.contains(platforms.at(i))) {
             releaseVersion = info.value(platforms.at(i)).toString();
@@ -76,6 +80,17 @@ void ServerInfo::readBuildInfo(QString file)
             releaseUrl.replace("%RELVERSION%", releaseVersion);
         }
         info.endGroup();
+        // "release-candidate" section currently only support the 2nd format.
+        info.beginGroup("release-candidate");
+        if(keys.contains(platforms.at(i))) {
+            QStringList entry = info.value(platforms.at(i)).toStringList();
+            relCandidateVersion = entry.at(0);
+            if(entry.size() > 1) {
+                relCandidateUrl = entry.at(1);
+            }
+        }
+        info.endGroup();
+
 
         info.beginGroup("status");
         QString status = tr("Unknown");
@@ -106,6 +121,10 @@ void ServerInfo::readBuildInfo(QString file)
                 setPlatformValue(variants.at(j), ServerInfo::CurReleaseVersion, releaseVersion);
                 setPlatformValue(variants.at(j), ServerInfo::CurReleaseUrl, releaseUrl);
             }
+            if(!relCandidateUrl.isEmpty()) {
+                setPlatformValue(variants.at(j), ServerInfo::RelCandidateVersion, relCandidateVersion);
+                setPlatformValue(variants.at(j), ServerInfo::RelCandidateUrl, relCandidateUrl);
+            }
             setPlatformValue(variants.at(j), ServerInfo::CurDevelUrl, develUrl);
         }
     }
diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h
index f541c86540..7021c3f154 100644
--- a/rbutil/rbutilqt/base/serverinfo.h
+++ b/rbutil/rbutilqt/base/serverinfo.h
@@ -36,6 +36,8 @@ class ServerInfo : public QObject
             CurDevelUrl,
             BleedingRevision,
             BleedingDate,
+            RelCandidateVersion,
+            RelCandidateUrl,
         };
 
         //! read in buildinfo file