Merge lp://staging/~sil2100/update-manager/ignore_prompt_lts_for_non-lts into lp://staging/update-manager

Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 2827
Proposed branch: lp://staging/~sil2100/update-manager/ignore_prompt_lts_for_non-lts
Merge into: lp://staging/update-manager
Diff against target: 92 lines (+37/-4)
4 files modified
UpdateManager/Core/MetaRelease.py (+12/-4)
debian/changelog (+8/-0)
debian/control (+1/-0)
tests/test_meta_release_core.py (+16/-0)
To merge this branch: bzr merge lp://staging/~sil2100/update-manager/ignore_prompt_lts_for_non-lts
Reviewer Review Type Date Requested Status
Brian Murray Approve
Review via email: mp+353851@code.staging.launchpad.net

Commit message

Ignore Prompt=lts for non-LTS series. This way if a user is on a non-LTS and has Prompt=lts, he/she will be upgraded to the next supported series until finally reaching an LTS.

Description of the change

Ignore Prompt=lts for non-LTS series. This way if a user is on a non-LTS and has Prompt=lts, he/she will be upgraded to the next supported series until finally reaching an LTS.

As mentioned by Brian, this will probably require some dependency changes in the ubuntu-release-upgrader as well since now MetaReleaseCore is using distro_info to check for the lts status.

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

This looks good to me, I just have a couple of in-line comments.

Revision history for this message
Brian Murray (brian-murray) :
review: Approve
2828. By Łukasz Zemczak

Small correction in a comment.

2829. By Łukasz Zemczak

Stop using 'type' as a variable name. It's a bad python variable name.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Done! Thanks for the review!

2830. By Łukasz Zemczak

Proposition: since MetaRelease.py uses distro-info now, I guess it's most logical to make it depend on it?

Revision history for this message
Brian Murray (brian-murray) wrote :

MetaRelease.py is included in the package python3-update-manager and python3-distupgrade so I think both of those should depend on distro-info.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, so leaving this as is - will you merge it once you have a moment today?

I can provide a dep addition to ubuntu-release-upgrader although I personally don't think it's needed. I didn't do it before as python3-distupgrade already depends on python3-update-manager, which after this merge lands will be pulling in the dependency of distro-info already. But I can understand if you want to add an explicit dep for clarity though.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: