← Back to branch summary

~mvo/update-manager/not-automatic

« back to all changes in this revision

Viewing changes to DistUpgrade/DistUpgradeCache.py

  • Committer: Michael Vogt
  • Date: 2008-05-21 16:01:17 UTC
  • mfrom: (952.1.10 hildon)
  • Revision ID: michael.vogt@ubuntu.com-20080521160117-lom591v3zpyk53yt
* UpdateManagerHildon/UpdateManagerHildon.py:
  - add hildon support (thanks to Tollef Fog Heen and
    Emmet Hikory)
  - make networkless upgrades more robust (LP: #227197)
* DistUpgrade/DistUpgradeViewGtk.py:
  - work around hang in svg loader (LP: #186465)

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/DistUpgradeCache.py
284
284
 
285
285
        # only enforce section if we have a network. Otherwise we run
286
286
        # into CD upgrade issues for installed language packs etc
287
 
        network = self.config.get("Options","withNetwork")
288
 
        if network == "True":
 
287
        if self.config.get("Options","withNetwork") == "True":
289
288
            logging.debug("Running KeepInstalledSection rules")
290
289
            # now the KeepInstalledSection code
291
290
            for section in self.config.getlist("Distro","KeepInstalledSection"):
374
373
        # evms gives problems, remove it if it is not in use
375
374
        self._checkAndRemoveEvms()
376
375
        # give the language-support-* packages a extra kick
377
 
        for pkg in self:
378
 
            if (pkg.name.startswith("language-support-") and
379
 
                pkg.isInstalled and
380
 
                not pkg.markedUpgrade):
381
 
                self.markInstall(pkg.name,"extra language-support- kick")
 
376
        # (if we have network, otherwise this will not work)
 
377
        if self.config.get("Options","withNetwork") == "True":
 
378
            for pkg in self:
 
379
                if (pkg.name.startswith("language-support-") and
 
380
                    pkg.isInstalled and
 
381
                    not pkg.markedUpgrade):
 
382
                    self.markInstall(pkg.name,"extra language-support- kick")
382
383
 
383
384
    def gutsyQuirks(self):
384
385
        """ this function works around quirks in the feisty->gutsy upgrade """