Release Upgrader

Merge lp://qastaging/~andrewsomething/ubuntu-release-upgrader/lp1199157 into lp://qastaging/ubuntu-release-upgrader

  1. lp1199157
  2. Merge into trunk
Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: 2649
Proposed branch: lp://qastaging/~andrewsomething/ubuntu-release-upgrader/lp1199157
Merge into: lp://qastaging/ubuntu-release-upgrader
Diff against target: 87 lines (+45/-1)
4 files modified
DistUpgrade/DistUpgradeController.py (+11/-1)
debian/changelog (+6/-0)
tests/data-sources-list-test/sources.list.proposed_enabled (+5/-0)
tests/test_sources_list.py (+23/-0)
To merge this branch: bzr merge lp://qastaging/~andrewsomething/ubuntu-release-upgrader/lp1199157
Reviewer Review Type Date Requested Status
Brian Murray Approve
Review via email: mp+173611@code.qastaging.launchpad.net

Description of the change

Disable proposed on upgrade to a development release.

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

This looks good but I also think it would help if entry.comment were used which I believe will add a comment to the entry in sources.list. That way if somebody is inspecting the file they will have an idea as to why it was commented out.

Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Makes sense. Should it also change entry.dist even though it's disabling it?

lp://qastaging/~andrewsomething/ubuntu-release-upgrader/lp1199157 updated
2649. By Andrew Starr-Bochicchio

Check first if the entry is already disabled and add a comment when disabling.

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

Yes, that is what happens in test_private_ppa_transition so that makes sense too. Thanks for working on this!

lp://qastaging/~andrewsomething/ubuntu-release-upgrader/lp1199157 updated
2650. By Andrew Starr-Bochicchio

Update entry.dist even though we disable it to be consistent with other entrys that get disabled.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

I tend to go on a re-enable spree after do-release-upgrade.
Can the comment, perhaps, have a more warning tone?

"Not for humans during development stage of release %s."

lp://qastaging/~andrewsomething/ubuntu-release-upgrader/lp1199157 updated
2651. By Andrew Starr-Bochicchio

Paint the bikeshed a brighter red.

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

This is great, thanks for your investigation into this issue and your fix.

review: Approve
Revision history for this message
Adolfo Jayme Barrientos (fitojb) wrote :

In the string "Not for humans during development stage of release %s" I think the word "users" fits better than "humans"...

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