Navigation Menu

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

Return only appropriate system-image channels; release properly #13

Merged
merged 5 commits into from Jul 17, 2020

Conversation

UniversalSuperBox
Copy link
Member

@UniversalSuperBox UniversalSuperBox commented Jul 6, 2020

The most important part of this PR is reducing the number of channels returned by com.canonical.SystemImage GetChannels over dbus. However, there is more technical debt to remove from system-image, including testing on the wrong version of Python and improper release hygiene.

Fixes #12

Should be merged with ubports/system-settings#242

This codebase already used the dictionary unpacking operator (**), which
was added in Python3.5. Therefore, 3.4 support was already broken and
should be removed officially.
Prior to this commit, get_channels would return every channel which was
available on the system-image server, which was not at all desirable.

Some changes to the test helpers were needed to make this happen. All
tests were previously written to assume only the nexus7 was available,
and my new test cases needed a different device as well.

Fixes #12
Revert a452ec6 and its subsequent
changes d388cba,
9d91e2f, and
8e8fddf.
UniversalSuperBox added a commit to ubports/system-settings that referenced this pull request Jul 6, 2020
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
@UniversalSuperBox UniversalSuperBox marked this pull request as ready for review July 6, 2020 23:25
Copy link
Member

@dobey dobey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fredldotme
Copy link

Tested on the Xperia X. Much better, it now only shows edge and "Development" on arm64. I haven't tried switching to devel yet though as it's my daily driver. Should this still show up on a device which doesn't have devel for the architecture?

@UniversalSuperBox
Copy link
Member Author

Hmm. Technically yes, that is correct. You're being shown ...arm64/edge and ...community/fredldotme/devel.

@UniversalSuperBox UniversalSuperBox merged commit 43fad89 into xenial Jul 17, 2020
UniversalSuperBox added a commit to ubports/system-settings that referenced this pull request Jul 17, 2020
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
@UniversalSuperBox UniversalSuperBox deleted the xenial_-_correct-si-channels branch July 17, 2020 18:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

It is not possible to determine if a server channel can be applied to a device or not.
3 participants