← Back to branch summary

~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 12:09:28 UTC
  • Revision ID: michael.vogt@ubuntu.com-20090216120928-xrcylim4xrcvo8bq
make backports lower priority than distro updates, ensure that the autoamtic dependency is higher version than the regular one

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/DistUpgradeController.py
563
563
                    
564
564
            # disable anything that is not from a official mirror
565
565
            if not validMirror:
 
566
                if entry.dist == self.fromDist:
 
567
                    entry.dist = self.toDist
 
568
                entry.comment += _("disabled on upgrade to %s") % self.toDist
566
569
                entry.disabled = True
567
570
                self.sources_disabled = True
568
571
                logging.debug("entry '%s' was disabled (unknown mirror)" % entry)
1000
1003
                                   "Please see the below message for more "
1001
1004
                                   "information. "),
1002
1005
                                   "%s" % e)
 
1006
        # run stuff after cleanup
 
1007
        if not self._partialUpgrade:
 
1008
            self.quirks.run("PostCleanup")
1003
1009
        # run the post upgrade scripts that can do fixup like xorg.conf
1004
1010
        # fixes etc - only do on real upgrades
1005
1011
        if not self._partialUpgrade:
1203
1209
        # 
1204
1210
        # make sure to remove file on cancel
1205
1211
        
 
1212
        # FIXME: use the DistUpgradeFetcherCore logic
 
1213
        #        in mirror_from_sources_list() here
 
1214
        #        (and factor that code out into a helper)
 
1215
 
1206
1216
        conf_option = "SourcesList"
1207
1217
        if self.config.has_option("PreRequists",conf_option+"-%s" % self.arch):
1208
1218
            conf_option = conf_option + "-%s" % self.arch
1430
1440
            # don't abort here, because it would restore the sources.list
1431
1441
            self._view.information(_("Upgrade complete"),
1432
1442
                                   _("The upgrade is completed but there "
1433
 
                                     "were errors during the ugprade "
 
1443
                                     "were errors during the upgrade "
1434
1444
                                     "process."))
1435
1445
            sys.exit(1) 
1436
1446
            
1472
1482
        if not self.doDistUpgrade():
1473
1483
            self._view.information(_("Upgrade complete"),
1474
1484
                                   _("The upgrade is completed but there "
1475
 
                                     "were errors during the ugprade "
 
1485
                                     "were errors during the upgrade "
1476
1486
                                     "process."))
1477
1487
            return False
1478
1488
        self._view.setStep(STEP_CLEANUP)
1479
1489
        if not self.doPostUpgrade():
1480
1490
            self._view.information(_("Upgrade complete"),
1481
1491
                                   _("The upgrade is completed but there "
1482
 
                                     "were errors during the ugprade "
 
1492
                                     "were errors during the upgrade "
1483
1493
                                     "process."))
1484
1494
            return False
1485
1495
        self._view.information(_("Upgrade complete"),