~mvo/update-manager/not-automatic

« back to all changes in this revision

Viewing changes to DistUpgrade/DistUpgradeController.py

  • Committer: Michael Vogt
  • Date: 2009-02-16 10:30:51 UTC
  • mfrom: (1256.1.14 main)
  • Revision ID: michael.vogt@ubuntu.com-20090216103051-m2aa2cgx0s2facxh
merge from the mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
1003
1003
                                   "Please see the below message for more "
1004
1004
                                   "information. "),
1005
1005
                                   "%s" % e)
 
1006
        # run stuff after cleanup
 
1007
        if not self._partialUpgrade:
 
1008
            self.quirks.run("PostCleanup")
1006
1009
        # run the post upgrade scripts that can do fixup like xorg.conf
1007
1010
        # fixes etc - only do on real upgrades
1008
1011
        if not self._partialUpgrade:
1437
1440
            # don't abort here, because it would restore the sources.list
1438
1441
            self._view.information(_("Upgrade complete"),
1439
1442
                                   _("The upgrade is completed but there "
1440
 
                                     "were errors during the ugprade "
 
1443
                                     "were errors during the upgrade "
1441
1444
                                     "process."))
1442
1445
            sys.exit(1) 
1443
1446
            
1479
1482
        if not self.doDistUpgrade():
1480
1483
            self._view.information(_("Upgrade complete"),
1481
1484
                                   _("The upgrade is completed but there "
1482
 
                                     "were errors during the ugprade "
 
1485
                                     "were errors during the upgrade "
1483
1486
                                     "process."))
1484
1487
            return False
1485
1488
        self._view.setStep(STEP_CLEANUP)
1486
1489
        if not self.doPostUpgrade():
1487
1490
            self._view.information(_("Upgrade complete"),
1488
1491
                                   _("The upgrade is completed but there "
1489
 
                                     "were errors during the ugprade "
 
1492
                                     "were errors during the upgrade "
1490
1493
                                     "process."))
1491
1494
            return False
1492
1495
        self._view.information(_("Upgrade complete"),