← Back to branch summary

~ubuntu-branches/ubuntu/maverick/update-manager/maverick-updates

« back to all changes in this revision

Viewing changes to DistUpgrade/DistUpgradeQuirks.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2010-05-25 10:48:27 UTC
  • Revision ID: james.westby@ubuntu.com-20100525104827-gkyntih6rxcra3kz
Tags: 1:0.140
https://launchpad.net/bugs/569469
https://launchpad.net/bugs/572228
https://launchpad.net/bugs/574279
* DistUpgrade/removal_blacklist.cfg:
  - remove gobuntu-desktop from the removal blacklist
* DistUpgrade/DistUpgradeController.py:
  - start apport only, do not modify any conffile (all versions
    of apport we upgrade from support this now)
* UpdateManager/UpdateManager.py:
  - fix crash when format string has the wrong number of arguments
    (LP: #569469)
  - fix minor UI resize issue (LP: #572228)
* DistUpgrade/DistUpgrade.cfg:
  - add ubuntu-netbook (LP: #574279)
* UpdateManager/Core/MetaRelease.py:
  - add looking for a "UpgradeBroken" tag that contains a reason string
    if the user should not be allowed to perform a release upgrade
* UpdateManager/UpdateManager.py, do-release-upgrade:
  - honor "UpgradeBroken" flag and error in this case
* updated to support lucid to maverick upgrades

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/DistUpgradeQuirks.py
378
378
    def StartUpgrade(self):
379
379
        self._applyPatches()
380
380
        self._removeOldApportCrashes()
381
 
        self._dealWithGrubLupin()
382
381
        self._removeBadMaintainerScripts()
383
382
        self._killUpdateNotifier()
384
383
        self._killKBluetooth()
673
672
        if os.path.exists("/usr/bin/killall"):
674
673
            logging.debug("killing update-notifier")
675
674
            subprocess.call(["killall","-q","update-notifier"])
676
 
    def _dealWithGrubLupin(self):
677
 
        """ deal with 10_lupin in grub2 for bug #540579 """
678
 
        md5sum = "7a1ad1c3b869d0e3a57351d063a59778"
679
 
        path = "/etc/grub.d/10_lupin"
680
 
        if (os.path.exists(path) and
681
 
            md5(open(path).read()).hexdigest() == md5sum):
682
 
            logging.debug("copying new 10_lupin")
683
 
            shutil.copy("10_lupin", "/etc/grub.d/10_lupin")
684
675
    def _killKBluetooth(self):
685
676
        """killall kblueplugd kbluetooth (riddel requested it)"""
686
677
        if os.path.exists("/usr/bin/killall"):