Skip to content
This repository has been archived by the owner on Sep 1, 2021. It is now read-only.

Commit

Permalink
Remove unnecessary (and unreliable) series check
Browse files Browse the repository at this point in the history
This check was only useful before we simplified the directory structure
of our system-image server. This leads to showing a lot of duplicate
channels, where only one option can actually be used.

The issue this worked around is solved correctly by
ubports/system-image#13
  • Loading branch information
UniversalSuperBox committed Jul 6, 2020
1 parent eab0d2e commit 25805ee
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions plugins/system-update/ChannelSettings.qml
Expand Up @@ -2,6 +2,7 @@
* This file is part of system-settings
*
* Copyright (C) 2017 The UBports project
* Copyright (C) 2020 UBports Foundation
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3, as published
Expand Down Expand Up @@ -57,11 +58,6 @@ ItemPage {
var prettyChannels = {"stable": i18n.tr("Stable"), "rc": i18n.tr("Release candidate"), "devel": i18n.tr("Development")}
SystemImage.getChannels().forEach(function (_channel) {
var channel = _channel.split("/");

// Do not show other ubuntu series then current
if (SystemImage.getSwitchChannel().indexOf(channel[1]) == -1)
return;

var prettyChannel = prettyChannels[channel[channel.length-1]] ? prettyChannels[channel[channel.length-1]] : channel[channel.length-1];
channelSelectorModel.append({ name: prettyChannel, description: "", channel: _channel});
});
Expand Down

0 comments on commit 25805ee

Please sign in to comment.