Merge ~slyon/ubuntu-release-upgrader:slyon/focal-python2-fix into ubuntu-release-upgrader:ubuntu/focal
Proposed by
Lukas Märdian
Status: | Merged |
---|---|
Approved by: | Brian Murray |
Approved revision: | fec707f21a0420e5638a9c1ea6c67099da180b17 |
Merged at revision: | 8768467e87a8ef12525fa59137602095a2230a4e |
Proposed branch: | ~slyon/ubuntu-release-upgrader:slyon/focal-python2-fix |
Merge into: | ubuntu-release-upgrader:ubuntu/focal |
Diff against target: |
91 lines (+32/-3) 2 files modified
DistUpgrade/DistUpgradeCache.py (+9/-0) DistUpgrade/DistUpgradeQuirks.py (+23/-3) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Murray | Approve | ||
Dimitri John Ledkov | lgtm | Approve | |
Review via email: mp+387057@code.launchpad.net |
Description of the change
Split the python_is_python2 quirk into a "prepare stage" (before calculating the dist-upgrade), where python-minimal is removed to avoid it producing any conflicts with packages depending on 'python' or 'python-minimal' and a "install stage" (after calculating the dist-upgrade), where the python-is-python2 package is installed to provide a clean upgrade path.
Fixes LP: #1875523
To post a comment you must log in.
While this looks fine, I've tested the diff on a bionic virtual machine on which I've applied the apt-clone file in bug 1875523 and I wasn't able to upgrade. Is there something else wrong with the packages in that clone file? Is there another way I can test this?