Merge lp://qastaging/~ubuntu-core-dev/ubuntu-release-upgrader/split into lp://qastaging/ubuntu-release-upgrader
Proposed by
Michael Terry
| Status: | Merged |
|---|---|
| Merged at revision: | 2509 |
| Proposed branch: | lp://qastaging/~ubuntu-core-dev/ubuntu-release-upgrader/split |
| Merge into: | lp://qastaging/ubuntu-release-upgrader |
| Diff against target: |
257419 lines (+61554/-117564) 254 files modified
BUGS (+0/-5) ChangeLog (+0/-62) DistUpgrade/DistUpgradeApport.py (+4/-4) DistUpgrade/DistUpgradeCache.py (+3/-3) DistUpgrade/DistUpgradeConfigParser.py (+1/-1) DistUpgrade/DistUpgradeController.py (+19/-19) DistUpgrade/DistUpgradeFetcherCore.py (+3/-3) DistUpgrade/DistUpgradeQuirks.py (+1/-1) DistUpgrade/DistUpgradeView.py (+1/-1) DistUpgrade/DistUpgradeViewGtk.py (+3/-3) DistUpgrade/DistUpgradeViewGtk3.py (+3/-3) DistUpgrade/DistUpgradeViewKDE.py (+7/-7) DistUpgrade/DistUpgradeViewText.py (+4/-4) DistUpgrade/SimpleGtk3builderApp.py (+61/-0) DistUpgrade/SimpleGtkbuilderApp.py (+61/-0) DistUpgrade/TODO (+2/-2) DistUpgrade/build-tarball.sh (+2/-2) DistUpgrade/crashdialog.ui (+1/-1) DistUpgrade/removal_blacklist.cfg (+2/-1) DistUpgrade/xorg_fix_proprietary.py (+4/-4) LGPL (+0/-510) README (+0/-18) TODO (+0/-22) UpdateManager/ChangelogViewer.py (+0/-283) UpdateManager/Core/AlertWatcher.py (+0/-96) UpdateManager/Core/DistUpgradeFetcherCore.py (+0/-313) UpdateManager/Core/MetaRelease.py (+0/-350) UpdateManager/Core/MyCache.py (+0/-366) UpdateManager/Core/UpdateList.py (+0/-102) UpdateManager/Core/roam.py (+0/-205) UpdateManager/Core/utils.py (+0/-510) UpdateManager/Dialogs.py (+0/-235) UpdateManager/DistUpgradeFetcher.py (+0/-143) UpdateManager/DistUpgradeFetcherKDE.py (+0/-188) UpdateManager/GtkProgress.py (+0/-89) UpdateManager/HelpViewer.py (+0/-33) UpdateManager/InstallProgress.py (+0/-93) UpdateManager/MetaReleaseGObject.py (+0/-57) UpdateManager/ReleaseNotesViewer.py (+0/-186) UpdateManager/ReleaseNotesViewerWebkit.py (+0/-54) UpdateManager/SimpleGtk3builderApp.py (+0/-61) UpdateManager/SimpleGtkbuilderApp.py (+0/-61) UpdateManager/UnitySupport.py (+0/-94) UpdateManager/UpdateManager.py (+0/-335) UpdateManager/UpdateProgress.py (+0/-80) UpdateManager/UpdatesAvailable.py (+0/-713) UpdateManager/__init__.py (+0/-1) UpdateManager/backend/InstallBackendAptdaemon.py (+0/-230) UpdateManager/backend/InstallBackendSynaptic.py (+0/-73) UpdateManager/backend/__init__.py (+0/-63) UpdateManager/check-meta-release.py (+0/-32) UpdateManager/dialog_release_notes.ui (+0/-70) UpdateManager/fetch-progress.ui (+0/-106) UpdateManagerText/UpdateManagerText.py (+0/-191) check-new-release-gtk (+6/-6) data/Makefile (+1/-1) data/com.ubuntu.update-manager.gschema.xml.in (+0/-54) data/gtkbuilder/UpdateManager.ui (+0/-504) data/icons/scalable/apps/system-software-update.svg (+0/-1519) data/update-manager.8 (+0/-78) data/update-manager.convert (+0/-9) data/update-manager.desktop.in (+0/-10) debian/91-release-upgrade (+2/-2) debian/changelog (+6/-0) debian/compat (+1/-1) debian/control (+42/-78) debian/copyright (+25/-22) debian/python-update-manager.install (+0/-6) debian/python3-dist-upgrade.install (+1/-0) debian/python3-update-manager.install (+0/-6) debian/release-upgrade-motd (+3/-3) debian/rules (+1/-2) debian/source/format (+1/-0) debian/source_ubuntu-release-upgrader.py (+20/-33) debian/ubuntu-release-upgrader-core.dirs (+1/-1) debian/ubuntu-release-upgrader-core.install (+3/-4) debian/ubuntu-release-upgrader-core.links (+1/-1) debian/ubuntu-release-upgrader-core.postinst (+1/-1) debian/ubuntu-release-upgrader-core.preinst (+1/-1) debian/ubuntu-release-upgrader-gtk.install (+2/-0) debian/ubuntu-release-upgrader-qt.install (+1/-0) debian/update-manager-kde.install (+0/-4) debian/update-manager-text.install (+0/-2) debian/update-manager.install (+0/-19) debian/update-manager.manpages (+0/-1) do-release-upgrade (+3/-3) help/C/Makefile.am (+0/-7) help/C/fdl-appendix.xml (+0/-655) help/C/legal.xml (+0/-76) help/C/update-manager-C.omf (+0/-18) help/C/update-manager.xml (+0/-1023) janitor/__init__.py (+0/-24) janitor/plugincore/NEWS.rst (+0/-7) janitor/plugincore/__init__.py (+0/-17) janitor/plugincore/core/file_cruft.py (+0/-53) janitor/plugincore/core/missing_package_cruft.py (+0/-52) janitor/plugincore/core/package_cruft.py (+0/-61) janitor/plugincore/cruft.py (+0/-159) janitor/plugincore/docs/README.rst (+0/-201) janitor/plugincore/exceptions.py (+0/-42) janitor/plugincore/i18n.py (+0/-34) janitor/plugincore/manager.py (+0/-185) janitor/plugincore/plugin.py (+0/-81) janitor/plugincore/plugins/deb_plugin.py (+0/-42) janitor/plugincore/plugins/dpkg_status_plugin.py (+0/-80) janitor/plugincore/plugins/kdelibs4to5_plugin.py (+0/-51) janitor/plugincore/plugins/langpack_manual_plugin.py (+0/-76) janitor/plugincore/plugins/remove_lilo_plugin.py (+0/-54) janitor/plugincore/testing/helpers.py (+0/-68) janitor/plugincore/tests/data/alpha_plugin.py (+0/-48) janitor/plugincore/tests/data/bravo_plugin.py (+0/-48) janitor/plugincore/tests/data/charlie_plugin.py (+0/-48) janitor/plugincore/tests/test_deb_plugin.py (+0/-44) janitor/plugincore/tests/test_documentation.py (+0/-93) janitor/plugincore/tests/test_dpkg_status_plugin.py (+0/-45) janitor/plugincore/tests/test_file_cruft.py (+0/-81) janitor/plugincore/tests/test_manager.py (+0/-171) janitor/plugincore/tests/test_missing_package_cruft.py (+0/-62) janitor/plugincore/tests/test_package_cruft.py (+0/-62) po/Makefile (+1/-1) po/POTFILES.in (+0/-53) po/af.po (+362/-876) po/am.po (+436/-878) po/an.po (+217/-865) po/ar.po (+774/-942) po/ast.po (+786/-952) po/az.po (+312/-868) po/be.po (+722/-947) po/bg.po (+712/-947) po/bn.po (+802/-970) po/bo.po (+618/-923) po/br.po (+590/-935) po/bs.po (+794/-951) po/ca.po (+796/-958) po/ca@valencia.po (+721/-956) po/ceb.po (+215/-866) po/ckb.po (+215/-866) po/crh.po (+686/-988) po/cs.po (+794/-961) po/csb.po (+505/-893) po/cv.po (+252/-866) po/cy.po (+618/-933) po/da.po (+794/-955) po/de.po (+819/-982) po/dv.po (+242/-865) po/el.po (+806/-966) po/en_AU.po (+823/-988) po/en_CA.po (+651/-980) po/en_GB.po (+818/-982) po/eo.po (+785/-949) po/es.po (+797/-961) po/et.po (+695/-935) po/eu.po (+712/-944) po/fa.po (+215/-865) po/fi.po (+780/-947) po/fil.po (+437/-882) po/fo.po (+215/-866) po/fr.po (+811/-972) po/fur.po (+291/-870) po/fy.po (+226/-868) po/ga.po (+215/-867) po/gd.po (+811/-969) po/gl.po (+795/-959) po/gu.po (+215/-866) po/gv.po (+215/-867) po/he.po (+774/-940) po/hi.po (+685/-927) po/hr.po (+796/-955) po/hu.po (+780/-946) po/hy.po (+215/-865) po/id.po (+707/-947) po/is.po (+583/-912) po/it.po (+798/-962) po/ja.po (+788/-953) po/jv.po (+215/-866) po/ka.po (+405/-883) po/kk.po (+708/-944) po/km.po (+764/-931) po/kn.po (+215/-866) po/ko.po (+775/-940) po/ku.po (+366/-876) po/ky.po (+215/-865) po/lb.po (+215/-866) po/lo.po (+215/-865) po/lt.po (+798/-961) po/lv.po (+795/-958) po/mk.po (+378/-881) po/ml.po (+233/-865) po/mn.po (+215/-865) po/mr.po (+328/-878) po/ms.po (+788/-955) po/mus.po (+215/-866) po/my.po (+225/-864) po/nb.po (+758/-951) po/nds.po (+253/-871) po/ne.po (+232/-865) po/nl.po (+805/-966) po/nn.po (+709/-948) po/oc.po (+808/-970) po/pa.po (+410/-872) po/pl.po (+758/-961) po/ps.po (+215/-866) po/pt.po (+721/-957) po/pt_BR.po (+796/-958) po/qu.po (+215/-866) po/ro.po (+808/-971) po/ru.po (+786/-949) po/rw.po (+229/-865) po/sc.po (+215/-866) po/sco.po (+215/-866) po/sd.po (+215/-866) po/shn.po (+215/-866) po/si.po (+215/-866) po/sk.po (+800/-962) po/sl.po (+794/-959) po/sq.po (+802/-967) po/sr.po (+786/-955) po/sv.po (+785/-948) po/ta.po (+218/-866) po/ta_LK.po (+218/-866) po/te.po (+435/-874) po/th.po (+633/-910) po/tl.po (+488/-889) po/tr.po (+788/-953) po/ubuntu-release-upgrader.pot (+216/-867) po/ug.po (+785/-947) po/uk.po (+798/-960) po/ur.po (+215/-866) po/uz.po (+215/-865) po/vi.po (+776/-941) po/xh.po (+215/-866) po/zh_CN.po (+750/-918) po/zh_HK.po (+680/-919) po/zh_TW.po (+747/-916) po/zu.po (+220/-865) setup.cfg (+1/-6) setup.py (+6/-30) tests/aptroot-update-origin/etc/apt/sources.list (+0/-5) tests/interactive_fetch_release_upgrader.py (+0/-89) tests/patchdir/pycompile_orig (+1/-1) tests/test_cache.py (+0/-37) tests/test_changelog.py (+0/-66) tests/test_country_mirror.py (+1/-1) tests/test_dist_upgrade_fetcher_core.py (+1/-1) tests/test_end_of_life.py (+6/-1) tests/test_meta_release_core.py (+0/-144) tests/test_proxy.py (+0/-30) tests/test_quirks.py (+1/-1) tests/test_update_origin.py (+0/-124) tests/test_utils.py (+0/-65) tests/test_xorg_fix_intrepid.py (+1/-1) ubuntu-support-status (+0/-185) update-manager (+0/-131) update-manager-text (+0/-71) |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-core-dev/ubuntu-release-upgrader/split |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Approve | ||
| Barry Warsaw (community) | Needs Fixing | ||
| Michael Vogt | Pending | ||
|
Review via email:
|
|||
Description of the change
As discussed at UDS, we wanted to split out the release upgrade code from update-manager to its own source package.
This is my attempt at doing so. I'm not *super* familiar with the code, so I may have made a mistake but for the most part it was straightforward.
Some notes:
* This still uses some UpdateManager imports, so we hard-dep on update-manager.
* This still uses a couple keys from update-manager's gsettings schema. It didn't seem worth the pain of transitioning.
* This still uses the same /etc/update-manager location that update-manager did (although all files under that directory are really owned by this package now). I used appropriate Breaks/Replaces lines, but didn't bother renaming the directory. It didn't seem worth the effort, especially since we'd also have to migrate user files in /etc/update-
* I re-enabled some tests that had been dormant (chmod +x)
* A couple apport-oriented Python bits pretend to be /usr/bin/
* I split packages into core/gtk/qt, matching what they were in update-manager, although the frontend packages are real tiny.
To post a comment you must log in.
Revision history for this message
| Michael Terry (mterry) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Diff against target: 224858 lines (+111053/-13464) 238 files modified (has conflicts)
Ouch! I'm guessing the branch is out of date with the latest trunk of update-manager. Could you take a look at updating your branch, hopefully reducing the diff lines and resolving the conflicts? Thanks!