Merge lp://qastaging/ubuntu/wily-proposed/ubuntu-release-upgrader into lp://qastaging/~oded-geek/ubuntu/wily/ubuntu-release-upgrader/fix-kde-upgrader
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/ubuntu/wily-proposed/ubuntu-release-upgrader |
| Merge into: | lp://qastaging/~oded-geek/ubuntu/wily/ubuntu-release-upgrader/fix-kde-upgrader |
| Diff against target: |
61335 lines (+15712/-10204) (has conflicts) 138 files modified
DistUpgrade/DistUpgradeCache.py (+1/-1) DistUpgrade/DistUpgradeController.py (+7/-1) DistUpgrade/DistUpgradeFetcherKDE.py (+7/-2) DistUpgrade/DistUpgradeVersion.py (+1/-1) DistUpgrade/DistUpgradeViewGtk3.py (+1/-1) DistUpgrade/build-tarball.sh (+3/-3) DistUpgrade/imported/invoke-rc.d (+124/-7) data/DistUpgrade.cfg (+19/-5) data/mirrors.cfg (+28/-10) data/removal_blacklist.cfg (+4/-1) debian/changelog (+111/-0) debian/control (+1/-1) po/af.po (+83/-83) po/am.po (+83/-83) po/an.po (+85/-85) po/ar.po (+81/-81) po/ast.po (+87/-84) po/az.po (+85/-85) po/be.po (+184/-100) po/bg.po (+81/-81) po/bn.po (+81/-81) po/bo.po (+81/-81) po/br.po (+82/-82) po/bs.po (+85/-82) po/ca.po (+85/-82) po/ca@valencia.po (+81/-81) po/ce.po (+85/-85) po/ceb.po (+85/-85) po/ckb.po (+85/-85) po/crh.po (+81/-81) po/cs.po (+81/-81) po/csb.po (+81/-81) po/cv.po (+85/-85) po/cy.po (+81/-81) po/da.po (+88/-85) po/de.po (+85/-82) po/dv.po (+85/-85) po/el.po (+87/-84) po/en_AU.po (+141/-138) po/en_CA.po (+137/-137) po/en_GB.po (+129/-126) po/eo.po (+81/-81) po/es.po (+85/-82) po/et.po (+81/-81) po/eu.po (+85/-82) po/fa.po (+85/-85) po/fi.po (+85/-82) po/fil.po (+83/-83) po/fo.po (+83/-83) po/fr.po (+85/-82) po/fr_CA.po (+87/-84) po/fur.po (+83/-83) po/fy.po (+85/-85) po/ga.po (+85/-85) po/gd.po (+83/-83) po/gl.po (+94/-91) po/gu.po (+85/-85) po/gv.po (+85/-85) po/he.po (+85/-85) po/hi.po (+81/-81) po/hr.po (+85/-82) po/hu.po (+85/-82) po/hy.po (+85/-85) po/ia.po (+1633/-0) po/id.po (+87/-84) po/is.po (+84/-84) po/it.po (+88/-85) po/ja.po (+88/-85) po/jv.po (+85/-85) po/ka.po (+83/-83) po/kk.po (+81/-81) po/km.po (+85/-82) po/kn.po (+85/-85) po/ko.po (+85/-82) po/ku.po (+83/-83) po/ky.po (+85/-85) po/lb.po (+85/-85) po/lo.po (+85/-85) po/lt.po (+81/-81) po/lv.po (+88/-85) po/mhr.po (+85/-85) po/mk.po (+83/-83) po/ml.po (+85/-85) po/mn.po (+85/-85) po/mr.po (+85/-85) po/ms.po (+87/-84) po/mus.po (+85/-85) po/my.po (+85/-85) po/nb.po (+85/-82) po/nds.po (+85/-85) po/ne.po (+85/-85) po/nl.po (+103/-93) po/nn.po (+81/-81) po/oc.po (+66/-63) po/om.po (+1633/-0) po/pa.po (+83/-83) po/pam.po (+1633/-0) po/pl.po (+87/-84) po/ps.po (+85/-85) po/pt.po (+88/-85) po/pt_BR.po (+88/-85) po/qu.po (+85/-85) po/ro.po (+88/-85) po/ru.po (+85/-82) po/rw.po (+85/-85) po/sc.po (+85/-85) po/sco.po (+85/-85) po/sd.po (+85/-85) po/se.po (+83/-83) po/shn.po (+85/-85) po/si.po (+83/-83) po/sk.po (+81/-81) po/sl.po (+66/-63) po/sq.po (+87/-84) po/sr.po (+81/-81) po/sv.po (+86/-83) po/szl.po (+64/-64) po/ta.po (+83/-83) po/ta_LK.po (+85/-85) po/te.po (+83/-83) po/tg.po (+87/-84) po/th.po (+81/-81) po/tl.po (+83/-83) po/tr.po (+85/-82) po/ubuntu-release-upgrader.pot (+104/-104) po/ug.po (+87/-84) po/uk.po (+85/-82) po/ur.po (+85/-85) po/uz.po (+85/-85) po/vi.po (+81/-81) po/xh.po (+85/-85) po/zh_CN.po (+85/-85) po/zh_HK.po (+81/-81) po/zh_TW.po (+87/-84) po/zu.po (+85/-85) tests/test_apport_crash.py (+2/-2) utils/demoted.cfg (+126/-1) utils/demotions.py (+12/-10) Text conflict in DistUpgrade/DistUpgradeFetcherKDE.py |
| To merge this branch: | bzr merge lp://qastaging/ubuntu/wily-proposed/ubuntu-release-upgrader |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Oded Arbel | Pending | ||
|
Review via email:
|
|||
Description of the change
Fix bug #1464330 (https:/
There is a bug in the parameters being passed to os.execv, causing python to try to cast the run_options array into a string instead of doing array catenation.
Unmerged revisions
- 90. By Martin Pitt
-
[ Brian Murray ]
* data/DistUpgrade.cfg: Update kernel version and types that will be
considered for removal. (LP: #1508539)[ Martin Pitt ]
* DistUpgrade/imported/ invoke- rc.d: Import current version with systemd
support, to fix upgrade failures of packages which only ship upstart and
systemd units, but no SysV init script (like lxc, ofono, or nfs-common).
(LP: #1504897) - 89. By Jonathan Riddell
-
Revert change from 15.10.11, already rejected from wily-proposed
- 88. By Brian Murray
-
Log the installed meta packages to make troubleshooting upgrades easier.
(LP: #1505359) - 87. By Brian Murray
-
* po/update-
manager. pot:
- updated (LP: #1502529) - 86. By Brian Murray
-
data/removal_
blacklist. cfg: make ubuntu- release- upgrader blacklist entry
more specific so it does not match ubuntu-release- upgrader- qt.
(LP: #1313514) - 85. By Martin Wimpress
-
* data/DistUpgrad
e.cfg:
+ Add Ubuntu MATE support.
* data/removal_blacklist. cfg:
+ Add Ubuntu MATE support.
* debian/control:
+ Standards-Version: 3.9.6 - 84. By Brian Murray
-
DistUpgrade/
build-tarball. sh: Copy the contents of demoted.cfg so it is
not a broken symlink. (LP: #1498193) - 83. By Harald Sitter
-
Restore pep8 change from .3
- 82. By Harald Sitter
-
Fix kde frontend to actually show an error when failing to get the release
notes. It was accessing a method in the wrong scope causing a crash rather
than displaying the error dialog. - 81. By Brian Murray
-
Fix PEP8 issue with DistUpgradeFetc
herKDE. py.
