Software Updater

Merge lp://staging/~brian-murray/update-manager/karmic into lp://staging/~ubuntu-core-dev/update-manager/karmic

  1. karmic
  2. Merge into karmic
Proposed by Brian Murray
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~brian-murray/update-manager/karmic
Merge into: lp://staging/~ubuntu-core-dev/update-manager/karmic
Diff against target: 27 lines
2 files modified
DistUpgrade/DistUpgrade.cfg (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp://staging/~brian-murray/update-manager/karmic
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+14239@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

update-manager doesn't seem to check the value of EnableApport just whether or not it is in the config file. Subsequently, apport is being enabled on dist upgrades from Jaunty to Karmic.

From DistUpgrade/DistUpgradeController.py:

    def doDistUpgrade(self):
        # check if we want apport running during the upgrade
        if self.config.getWithDefault("Distro","EnableApport", False):
            self.enableApport()

lp://staging/~brian-murray/update-manager/karmic updated
1584. By Brian Murray

adding in bug number

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'DistUpgrade/DistUpgrade.cfg'
--- DistUpgrade/DistUpgrade.cfg 2009-10-20 14:25:42 +0000
+++ DistUpgrade/DistUpgrade.cfg 2009-10-30 21:50:23 +0000
@@ -29,7 +29,7 @@
29PostUpgradeRemove=libflashsupport29PostUpgradeRemove=libflashsupport
30PostUpgradeUpgrade=brasero30PostUpgradeUpgrade=brasero
31PostInstallScripts=./xorg_fix_proprietary.py31PostInstallScripts=./xorg_fix_proprietary.py
32EnableApport=no32#EnableApport=no
33# this supported blacklisting certain versions to ensure we do not upgrade33# this supported blacklisting certain versions to ensure we do not upgrade
34# to a known broken version. python2.6 was broken during intrepid->jaunty34# to a known broken version. python2.6 was broken during intrepid->jaunty
35BadVersions=python2.6_2.6.1-1ubuntu8,python-central_0.6.11ubuntu535BadVersions=python2.6_2.6.1-1ubuntu8,python-central_0.6.11ubuntu5
3636
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-30 10:24:04 +0000
+++ debian/changelog 2009-10-30 21:50:23 +0000
@@ -1,3 +1,10 @@
1update-manager (1:0.126.9) karmic-proposed; urgency=low
2
3 * DistUpgrade/DistUpgrade.cfg:
4 - really stop enabling apport during the upgrade (LP: #465619)
5
6 -- Brian Murray <brian@ubuntu.com> Fri, 30 Oct 2009 13:54:08 -0700
7
1update-manager (1:0.126.8) karmic-proposed; urgency=low8update-manager (1:0.126.8) karmic-proposed; urgency=low
29
3 * when the server is overloaded and no Release file information10 * when the server is overloaded and no Release file information

Subscribers

People subscribed via source and target branches

to all changes: