Release Upgrader

Merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/patching-get-distro into lp://qastaging/ubuntu-release-upgrader

patching-get-distro
Merge into trunk

Proposed by Brian Murray on 2015-11-17

Status:	Merged
Merged at revision:	2937
Proposed branch:	lp://qastaging/~brian-murray/ubuntu-release-upgrader/patching-get-distro
Merge into:	lp://qastaging/ubuntu-release-upgrader
Diff against target:	332 lines (+167/-23) 3 files modified DistUpgrade/DistUpgradeController.py (+55/-19) tests/data-sources-list-test/sources.list.obsolete_mirror (+10/-0) tests/test_sources_list.py (+102/-4)
To merge this branch:	bzr merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/patching-get-distro
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Barry Warsaw (community)		2015-11-17	Needs Fixing on 2015-11-18
Review via email: mp+277770@code.qastaging.launchpad.net

Description of the change

I want to update the code that only adds new mirrors to ubuntu-release-upgrader to also remove mirrors. However, if that change is made and you have an obsolete mirror you'll be left with a sources.list file that only contains main for the destination release. This'll result in a bad upgrade experience. See the linked bug for details.

I've modified the release upgrader to copy the disabled entries in sources.list and replace the server uri so that the upgrade will proceed and not leave a bunch of packages unupgraded. I've added a test, test_sources_list_inactive_mirror, for this.

Revision history for this message

Barry Warsaw (barry) wrote on 2015-11-18:

LGTM, with just a few style nits. However, there's a merge conflict that needs to be fixed first.

review: Needs Fixing

lp://qastaging/~brian-murray/ubuntu-release-upgrader/patching-get-distro updated on 2015-11-18

2942. By Brian Murray on 2015-11-18: nitpick changes based off reviewer feedback
2943. By Brian Murray on 2015-11-18: Continue to leave BaseMetaPkgs commented out in the test version of DistUpgrade.cfg as it breaks other tests, set BaseMetaPkgs in the tests that require it.
2944. By Brian Murray on 2015-11-18: clarify notes regarding old code