Merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/deb-to-snap into lp://qastaging/ubuntu-release-upgrader

Proposed by Brian Murray
Status: Merged
Merged at revision: 3144
Proposed branch: lp://qastaging/~brian-murray/ubuntu-release-upgrader/deb-to-snap
Merge into: lp://qastaging/ubuntu-release-upgrader
Diff against target: 101 lines (+76/-0)
1 file modified
DistUpgrade/DistUpgradeQuirks.py (+76/-0)
To merge this branch: bzr merge lp://qastaging/~brian-murray/ubuntu-release-upgrader/deb-to-snap
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+348916@code.qastaging.launchpad.net
To post a comment you must log in.
3142. By Brian Murray

fix merge conflict

3143. By Brian Murray

really fix merge conflict

Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
3144. By Brian Murray

DistUpgradeQuirks.py: adjust language based on reviewer feedback, raise a dialog instead of aborting the upgrade

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

I've made most of the changes suggested.

Revision history for this message
Steve Langasek (vorlon) wrote :

The changes all look good; I think we still need to sort out the timeout on the snap downloads before pushing this through.

Revision history for this message
Steve Langasek (vorlon) wrote :

FWIW I think it would be nicer if the prompt offered to "retry" the failed snap store check, rather than being just a yes/no dialog; but I don't think that should block this MP.

3145. By Brian Murray

DistUpgradeQuirks.py: wait for the snap install to complete rather than using a timeout

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

On Thu, Jul 05, 2018 at 07:24:45PM -0000, Steve Langasek wrote:
> The changes all look good; I think we still need to sort out the timeout on the snap downloads before pushing this through.

That's sorted with my latest change.

--
Brian Murray

3146. By Brian Murray

DistUpgradeQuirks.py: modify the quirks for cosmic

Revision history for this message
Steve Langasek (vorlon) :
review: Approve
3147. By Brian Murray

clarify docstring

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