diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-28 09:29:31 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-28 09:29:31 +0200 |
| commit | 288544afdf646aeebaa1dc7790612a1af098352b (patch) | |
| tree | 688ce53f51c39e34c496763b4392b92dbaa393fa /DistUpgrade | |
| parent | 558f70b24693a1692be2ab79c4047af762f9e010 (diff) | |
| parent | 37827c0f97d0711820443325d3d1c65b755cdfb4 (diff) | |
| download | python-apt-288544afdf646aeebaa1dc7790612a1af098352b.tar.gz | |
* merged with mvo devel branch
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/Changelog | 5 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 12 | ||||
| l--------- | DistUpgrade/Ubuntu.info | 1 |
3 files changed, 15 insertions, 3 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 25d20acb..195e45e1 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,8 @@ +2006-08-18: + - sort the demoted software list +2006-07-31: + - updated to edgy + - uploadedd 2006-05-31: - fix bug in the free space calculation (#47092) - updated ReleaseAnnouncement diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 9842484d..3a775099 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -32,7 +32,7 @@ import re import statvfs from DistUpgradeConfigParser import DistUpgradeConfig -from aptsources import SourcesList, SourceEntry, is_mirror +from aptsources import SourcesList, SourceEntry, Distribution, is_mirror from gettext import gettext as _ import gettext from DistUpgradeCache import MyCache @@ -73,6 +73,11 @@ class DistUpgradeControler(object): def rewriteSourcesList(self, mirror_check=True): logging.debug("rewriteSourcesList()") + # enable main (we always need this!) + distro = Distribution() + distro.get_sources(self.sources) + distro.enable_component(self.sources, "main") + # this must map, i.e. second in "from" must be the second in "to" # (but they can be different, so in theory we could exchange # component names here) @@ -143,7 +148,7 @@ class DistUpgradeControler(object): def updateSourcesList(self): logging.debug("updateSourcesList()") - self.sources = SourcesList(withMatcher=False) + self.sources = SourcesList(matcherPath=".") if not self.rewriteSourcesList(mirror_check=True): logging.error("No valid mirror found") res = self._view.askYesNoQuestion(_("No valid mirror found"), @@ -390,7 +395,8 @@ class DistUpgradeControler(object): open(demotions_file).readlines())) installed_demotions = filter(lambda pkg: pkg.isInstalled and pkg.name in demotions, self.cache) if len(installed_demotions) > 0: - demoted = [pkg.name for pkg in installed_demotions] + demoted = [pkg.name for pkg in installed_demotions] + demoted.sort() logging.debug("demoted: '%s'" % " ".join(demoted)) self._view.information(_("Some software no longer officially " "supported"), diff --git a/DistUpgrade/Ubuntu.info b/DistUpgrade/Ubuntu.info new file mode 120000 index 00000000..171be7e1 --- /dev/null +++ b/DistUpgrade/Ubuntu.info @@ -0,0 +1 @@ +../data/channels/Ubuntu.info
\ No newline at end of file |