← Back to branch summary

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

« back to all changes in this revision

Viewing changes to DistUpgrade/DistUpgradeController.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2010-05-31 15:14:22 UTC
  • Revision ID: james.westby@ubuntu.com-20100531151422-786kv380tl20cmqx
Tags: 1:0.141
https://launchpad.net/bugs/396187
* UpdateManager/backend/__init__.py:
  - switch to aptdaemon as install backend by default (unless
    the user has UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC in his
    environment)
  - merged lp:~glatzor/update-manager/ubuntu-glatzor (many thanks!)
* DistUpgrade/DistUpgradeController.py:
 - use pockets from DistUpgrade.cfg instead of hard-coding them
* tests/test_sources_list.py:
  - update tests
* UpdateManager/Core/utils.py:
  - fix url_downloadable and add tests, based on the patch from
    Paulo Albuquerque, many thanks (LP: #396187)
* UpdateManager/UpdateManager.py:
  - fix typo (thanks to seb128)
* DistUpgrade/mirrors.cfg:
  - support upgrades when sources.list uses the new
    mirror://mirrors.ubuntu.com/mirrors.txt 
    uri
* UpdateManager/GtkProgress.py:
  - do not open a cache open progress window, instead show the
    progress inline in the window

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/DistUpgradeController.py
500
500
        # this must map, i.e. second in "from" must be the second in "to"
501
501
        # (but they can be different, so in theory we could exchange
502
502
        #  component names here)
503
 
        fromDists = [self.fromDist,
504
 
                     self.fromDist+"-security",
505
 
                     self.fromDist+"-updates",
506
 
                     self.fromDist+"-proposed",
507
 
                     self.fromDist+"-backports"
508
 
                    ]
509
 
        toDists = [self.toDist,
510
 
                   self.toDist+"-security",
511
 
                   self.toDist+"-updates",
512
 
                   self.toDist+"-proposed",
513
 
                   self.toDist+"-backports"
514
 
                   ]
515
 
 
 
503
        pockets = self.config.getlist("Sources","Pockets")
 
504
        fromDists = [self.fromDist] + ["%s-%s" % (self.fromDist, x) 
 
505
                                       for x in pockets]
 
506
        toDists = [self.toDist] + ["%s-%s" % (self.toDist,x) 
 
507
                                   for x in pockets]
516
508
        self.sources_disabled = False
517
509
 
518
510
        # look over the stuff we have