summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-05-22 07:55:45 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-14 13:03:06 +0000
commit66d7c21cde8e0846c37e02972c413674aa13dd09 (patch)
tree2164e3765348583dd17e0326484157d972bf06f2 /rbutil
parent30fb53d47f7f96019956de32a94f3c77fd9aa609 (diff)
downloadrockbox-66d7c21cde8e0846c37e02972c413674aa13dd09.tar.gz
rockbox-66d7c21cde8e0846c37e02972c413674aa13dd09.tar.bz2
rockbox-66d7c21cde8e0846c37e02972c413674aa13dd09.zip
rbutil: Handle the new Retired target status.
It's considerd stable, but does not have dev builds any more So don't display download options to get RC or dev builds. Change-Id: I68ed6adc2dd72d54464d3ff8d8e8df28088f8020
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/base/serverinfo.cpp4
-rw-r--r--rbutil/rbutilqt/gui/selectiveinstallwidget.cpp7
2 files changed, 8 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp
index 4773c1ee71..d2588abfc4 100644
--- a/rbutil/rbutilqt/base/serverinfo.cpp
+++ b/rbutil/rbutilqt/base/serverinfo.cpp
@@ -117,6 +117,9 @@ void ServerInfo::readBuildInfo(QString file)
QString status = tr("Unknown");
switch(info.value(platforms.at(i)).toInt())
{
+ case 0:
+ status = tr("Stable (Retired)");
+ break;
case 1:
status = tr("Unusable");
break;
@@ -219,4 +222,3 @@ QVariant ServerInfo::platformValue(QString platform, enum ServerInfos info)
LOG_INFO() << "GET:" << s << serverInfos.value(s, d).toString();
return serverInfos.value(s, d);
}
-
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
index ffc5d98d72..9b5bc4d653 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -92,8 +92,11 @@ void SelectiveInstallWidget::updateVersion(void)
// re-populate all version items
m_versions.clear();
m_versions.insert("release", ServerInfo::value(ServerInfo::CurReleaseVersion).toString());
- m_versions.insert("development", ServerInfo::value(ServerInfo::BleedingRevision).toString());
- m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString());
+ // Don't populate RC or development selections if target has been retired.
+ if (ServerInfo::value(ServerInfo::CurStatus) != tr("Stable (Retired)")) {
+ m_versions.insert("development", ServerInfo::value(ServerInfo::BleedingRevision).toString());
+ m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString());
+ }
ui.selectedVersion->clear();
if(!m_versions["release"].isEmpty()) {