Merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/remove-mirrors into lp://qastaging/ubuntu-release-upgrader
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Barry Warsaw (community) | Approve | ||
Review via email:
|
Description of the change
The pre-build script for ubuntu-
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.
LGTM, with just a few cosmetic comments. I'll just assume the changes to mirror.cfg are correct. :)