Merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/better-uri-testing into lp://qastaging/ubuntu-release-upgrader
| Status: | Merged |
|---|---|
| Merged at revision: | 3227 |
| Proposed branch: | lp://qastaging/~brian-murray/ubuntu-release-upgrader/better-uri-testing |
| Merge into: | lp://qastaging/ubuntu-release-upgrader |
| Diff against target: |
144 lines (+62/-10) 3 files modified
DistUpgrade/DistUpgradeController.py (+15/-5) debian/changelog (+9/-0) tests/test_sources_list.py (+38/-5) |
| To merge this branch: | bzr merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/better-uri-testing |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Steve Langasek | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
As a part of improving the release upgrade process for people with PPAs enabled a check was added to see if the release to which we are upgrading is provided by the archive (LP: #1807043). However, this check is done for every entry and its uri in a sources.list file which could result in a situation, if a network was flakey, where main was enabled and universe was not (LP: #1822886).
If we instead have a dictionary of the entry.uris and whether or not they were accessible all the sources.list entries with that uri will be disabled. In the case of the Ubuntu archive this will result in 'ubuntu-minimal' not being downloadable and the upgrade process will abort. This is better than the upgrade proceeding and some components for an archive being disabled. Additionally, the multiple calls to _sourcesListEnt
| Steve Langasek (vorlon) | # |
