Merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/remove-mirrors into lp://qastaging/ubuntu-release-upgrader

Proposed by Brian Murray
Status: Merged
Merged at revision: 2938
Proposed branch: lp://qastaging/~brian-murray/ubuntu-release-upgrader/remove-mirrors
Merge into: lp://qastaging/ubuntu-release-upgrader
Diff against target: 975 lines (+35/-560)
2 files modified
data/mirrors.cfg (+10/-551)
utils/update_mirrors.py (+25/-9)
To merge this branch: bzr merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/remove-mirrors
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Approve
Review via email: mp+276412@code.qastaging.launchpad.net

Description of the change

The pre-build script for ubuntu-release-upgrader runs some code to update the mirrors.cfg file which contains the official ubuntu mirrors and is used for verifying the client's sources.list file. However, that code only adds new mirrors and never removes mirrors that are no longer valid.

Looking at the mirrors.cfg file it seems to first have been manually created with the first 23 lines being permanent and then divided into country sections. The update code only ever appends mirrors, but I thought it was worth keeping country sections so have done that in this merge proposal. This may end up creating country sections w/o any mirrors but those could be removed manually.

This should not be merged until bug 1511783 is fixed.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

LGTM, with just a few cosmetic comments. I'll just assume the changes to mirror.cfg are correct. :)

review: Approve
2917. By Brian Murray

changes based on barry's feedback

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