Release Upgrader

Merge ubuntu-release-upgrader:server-mode-check into ubuntu-release-upgrader:ubuntu/main

  1. Git
  2. lp:ubuntu-release-upgrader
  3. server-mode-check
  4. Merge into ubuntu/main
Proposed by Brian Murray
Status: Superseded
Proposed branch: ubuntu-release-upgrader:server-mode-check
Merge into: ubuntu-release-upgrader:ubuntu/main
Diff against target: 33204 lines (+6087/-4298) (has conflicts)
142 files modified
DistUpgrade/DistUpgradeController.py (+7/-2)
DistUpgrade/DistUpgradeQuirks.py (+109/-0)
DistUpgrade/DistUpgradeVersion.py (+4/-0)
data/DistUpgrade.cfg.groovy (+131/-0)
data/DistUpgrade.cfg.hirsute (+131/-0)
data/demoted.cfg.groovy (+1/-0)
data/demoted.cfg.hirsute (+1/-0)
data/mirrors.cfg (+40/-8)
debian/changelog (+40/-0)
debian/control (+1/-0)
debian/tests/control (+1/-1)
po/af.po (+38/-34)
po/am.po (+38/-34)
po/an.po (+38/-34)
po/ar.po (+38/-34)
po/ast.po (+38/-34)
po/az.po (+38/-34)
po/be.po (+38/-34)
po/bg.po (+38/-34)
po/bn.po (+38/-34)
po/bo.po (+38/-34)
po/br.po (+38/-34)
po/bs.po (+38/-34)
po/ca.po (+38/-34)
po/ca@valencia.po (+38/-34)
po/ce.po (+38/-34)
po/ceb.po (+38/-34)
po/ckb.po (+38/-34)
po/crh.po (+38/-34)
po/cs.po (+38/-34)
po/csb.po (+38/-34)
po/cv.po (+38/-34)
po/cy.po (+38/-34)
po/da.po (+38/-34)
po/de.po (+38/-34)
po/dv.po (+38/-34)
po/el.po (+38/-34)
po/en_AU.po (+38/-34)
po/en_CA.po (+38/-34)
po/en_GB.po (+38/-34)
po/eo.po (+38/-34)
po/es.po (+38/-34)
po/et.po (+38/-34)
po/eu.po (+38/-34)
po/fa.po (+38/-34)
po/fi.po (+38/-34)
po/fil.po (+38/-34)
po/fo.po (+38/-34)
po/fr.po (+38/-34)
po/fr_CA.po (+38/-34)
po/fur.po (+38/-34)
po/fy.po (+38/-34)
po/ga.po (+38/-34)
po/gd.po (+38/-34)
po/gl.po (+38/-34)
po/gu.po (+38/-34)
po/gv.po (+38/-34)
po/he.po (+38/-34)
po/hi.po (+38/-34)
po/hr.po (+38/-34)
po/hu.po (+38/-34)
po/hy.po (+38/-34)
po/ia.po (+38/-34)
po/id.po (+38/-34)
po/is.po (+38/-34)
po/it.po (+38/-34)
po/ja.po (+38/-34)
po/jv.po (+38/-34)
po/ka.po (+38/-34)
po/kk.po (+38/-34)
po/km.po (+38/-34)
po/kn.po (+38/-34)
po/ko.po (+38/-34)
po/ku.po (+38/-34)
po/ky.po (+38/-34)
po/lb.po (+38/-34)
po/ln.po (+38/-34)
po/lo.po (+38/-34)
po/lt.po (+38/-34)
po/lv.po (+38/-34)
po/mhr.po (+38/-34)
po/mjw.po (+38/-34)
po/mk.po (+38/-34)
po/ml.po (+38/-34)
po/mn.po (+38/-34)
po/mnw.po (+38/-34)
po/mr.po (+38/-34)
po/ms.po (+38/-34)
po/mus.po (+38/-34)
po/my.po (+38/-34)
po/nb.po (+38/-34)
po/nds.po (+38/-34)
po/ne.po (+38/-34)
po/nl.po (+38/-34)
po/nn.po (+38/-34)
po/oc.po (+38/-34)
po/om.po (+38/-34)
po/pa.po (+38/-34)
po/pam.po (+38/-34)
po/pl.po (+38/-34)
po/ps.po (+38/-34)
po/pt.po (+38/-34)
po/pt_BR.po (+38/-34)
po/qu.po (+38/-34)
po/ro.po (+38/-34)
po/ru.po (+38/-34)
po/rw.po (+38/-34)
po/sc.po (+38/-34)
po/sco.po (+38/-34)
po/sd.po (+38/-34)
po/se.po (+38/-34)
po/shn.po (+38/-34)
po/si.po (+38/-34)
po/sk.po (+38/-34)
po/sl.po (+38/-34)
po/sq.po (+38/-34)
po/sr.po (+38/-34)
po/sv.po (+38/-34)
po/szl.po (+38/-34)
po/ta.po (+38/-34)
po/ta_LK.po (+38/-34)
po/te.po (+38/-34)
po/tg.po (+38/-34)
po/th.po (+38/-34)
po/tl.po (+38/-34)
po/tr.po (+38/-34)
po/ubuntu-release-upgrader.pot (+38/-34)
po/ug.po (+38/-34)
po/uk.po (+38/-34)
po/ur.po (+38/-34)
po/uz.po (+38/-34)
po/vi.po (+38/-34)
po/xh.po (+38/-34)
po/zh_CN.po (+38/-34)
po/zh_HK.po (+38/-34)
po/zh_TW.po (+38/-34)
po/zu.po (+38/-34)
pre-build.sh (+6/-1)
tests/test_quirks.py (+242/-0)
utils/demoted.cfg.focal (+0/-2)
utils/demoted.cfg.groovy (+311/-0)
utils/demoted.cfg.hirsute (+274/-0)
Conflict in DistUpgrade/DistUpgradeVersion.py
Conflict in data/mirrors.cfg
Conflict in debian/changelog
Conflict in po/af.po
Conflict in po/am.po
Conflict in po/an.po
Conflict in po/ar.po
Conflict in po/ast.po
Conflict in po/az.po
Conflict in po/be.po
Conflict in po/bg.po
Conflict in po/bn.po
Conflict in po/bo.po
Conflict in po/br.po
Conflict in po/bs.po
Conflict in po/ca.po
Conflict in po/ca@valencia.po
Conflict in po/ce.po
Conflict in po/ceb.po
Conflict in po/ckb.po
Conflict in po/crh.po
Conflict in po/cs.po
Conflict in po/csb.po
Conflict in po/cv.po
Conflict in po/cy.po
Conflict in po/da.po
Conflict in po/de.po
Conflict in po/dv.po
Conflict in po/el.po
Conflict in po/en_AU.po
Conflict in po/en_CA.po
Conflict in po/en_GB.po
Conflict in po/eo.po
Conflict in po/es.po
Conflict in po/et.po
Conflict in po/eu.po
Conflict in po/fa.po
Conflict in po/fi.po
Conflict in po/fil.po
Conflict in po/fo.po
Conflict in po/fr.po
Conflict in po/fr_CA.po
Conflict in po/fur.po
Conflict in po/fy.po
Conflict in po/ga.po
Conflict in po/gd.po
Conflict in po/gl.po
Conflict in po/gu.po
Conflict in po/gv.po
Conflict in po/he.po
Conflict in po/hi.po
Conflict in po/hr.po
Conflict in po/hu.po
Conflict in po/hy.po
Conflict in po/ia.po
Conflict in po/id.po
Conflict in po/is.po
Conflict in po/it.po
Conflict in po/ja.po
Conflict in po/jv.po
Conflict in po/ka.po
Conflict in po/kk.po
Conflict in po/km.po
Conflict in po/kn.po
Conflict in po/ko.po
Conflict in po/ku.po
Conflict in po/ky.po
Conflict in po/lb.po
Conflict in po/ln.po
Conflict in po/lo.po
Conflict in po/lt.po
Conflict in po/lv.po
Conflict in po/mhr.po
Conflict in po/mjw.po
Conflict in po/mk.po
Conflict in po/ml.po
Conflict in po/mn.po
Conflict in po/mnw.po
Conflict in po/mr.po
Conflict in po/ms.po
Conflict in po/mus.po
Conflict in po/my.po
Conflict in po/nb.po
Conflict in po/nds.po
Conflict in po/ne.po
Conflict in po/nl.po
Conflict in po/nn.po
Conflict in po/oc.po
Conflict in po/om.po
Conflict in po/pa.po
Conflict in po/pam.po
Conflict in po/pl.po
Conflict in po/ps.po
Conflict in po/pt.po
Conflict in po/pt_BR.po
Conflict in po/qu.po
Conflict in po/ro.po
Conflict in po/ru.po
Conflict in po/rw.po
Conflict in po/sc.po
Conflict in po/sco.po
Conflict in po/sd.po
Conflict in po/se.po
Conflict in po/shn.po
Conflict in po/si.po
Conflict in po/sk.po
Conflict in po/sl.po
Conflict in po/sq.po
Conflict in po/sr.po
Conflict in po/sv.po
Conflict in po/szl.po
Conflict in po/ta.po
Conflict in po/ta_LK.po
Conflict in po/te.po
Conflict in po/tg.po
Conflict in po/th.po
Conflict in po/tl.po
Conflict in po/tr.po
Conflict in po/ubuntu-release-upgrader.pot
Conflict in po/ug.po
Conflict in po/uk.po
Conflict in po/ur.po
Conflict in po/uz.po
Conflict in po/vi.po
Conflict in po/xh.po
Conflict in po/zh_CN.po
Conflict in po/zh_HK.po
Conflict in po/zh_TW.po
Conflict in po/zu.po
Reviewer Review Type Date Requested Status
Julian Andres Klode Needs Fixing
Review via email: mp+428277@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2022-08-15.

Description of the change

Looking at the calls to self.cache.need_server_mode() in DistUpgradeController.py one of them can do more harm than good by switching from a "desktop" mode upgrade to a "server" mode upgrade. This changes that by only calling the function again if "server" mode is already set.

I tested an upgrade of an Ubuntu 20.04 server install with this change and it worked without issue. Additionally, I tested a desktop upgrade of Ubuntu 22.04 (only the calculation of the DistUpgrade) and it also worked without an issue.

It might also be necessary to reset `os.environ["RELEASE_UPGRADE_MODE"]`, however it looks like there is an existing bug with it not being set after changing mode.

To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) wrote :

Please rebase and fix the conflicts, this is not reviewable as is.

review: Needs Fixing

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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