diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-05-22 07:55:45 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-14 13:03:06 +0000 |
commit | 66d7c21cde8e0846c37e02972c413674aa13dd09 (patch) | |
tree | 2164e3765348583dd17e0326484157d972bf06f2 /rbutil | |
parent | 30fb53d47f7f96019956de32a94f3c77fd9aa609 (diff) | |
download | rockbox-66d7c21cde8e0846c37e02972c413674aa13dd09.tar.gz 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.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 7 |
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) | |||
117 | QString status = tr("Unknown"); | 117 | QString status = tr("Unknown"); |
118 | switch(info.value(platforms.at(i)).toInt()) | 118 | switch(info.value(platforms.at(i)).toInt()) |
119 | { | 119 | { |
120 | case 0: | ||
121 | status = tr("Stable (Retired)"); | ||
122 | break; | ||
120 | case 1: | 123 | case 1: |
121 | status = tr("Unusable"); | 124 | status = tr("Unusable"); |
122 | break; | 125 | break; |
@@ -219,4 +222,3 @@ QVariant ServerInfo::platformValue(QString platform, enum ServerInfos info) | |||
219 | LOG_INFO() << "GET:" << s << serverInfos.value(s, d).toString(); | 222 | LOG_INFO() << "GET:" << s << serverInfos.value(s, d).toString(); |
220 | return serverInfos.value(s, d); | 223 | return serverInfos.value(s, d); |
221 | } | 224 | } |
222 | |||
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) | |||
92 | // re-populate all version items | 92 | // re-populate all version items |
93 | m_versions.clear(); | 93 | m_versions.clear(); |
94 | m_versions.insert("release", ServerInfo::value(ServerInfo::CurReleaseVersion).toString()); | 94 | m_versions.insert("release", ServerInfo::value(ServerInfo::CurReleaseVersion).toString()); |
95 | m_versions.insert("development", ServerInfo::value(ServerInfo::BleedingRevision).toString()); | 95 | // Don't populate RC or development selections if target has been retired. |
96 | m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString()); | 96 | if (ServerInfo::value(ServerInfo::CurStatus) != tr("Stable (Retired)")) { |
97 | m_versions.insert("development", ServerInfo::value(ServerInfo::BleedingRevision).toString()); | ||
98 | m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString()); | ||
99 | } | ||
97 | 100 | ||
98 | ui.selectedVersion->clear(); | 101 | ui.selectedVersion->clear(); |
99 | if(!m_versions["release"].isEmpty()) { | 102 | if(!m_versions["release"].isEmpty()) { |