summaryrefslogtreecommitdiff
path: root/DistUpgrade
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-09-26 23:34:28 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-09-26 23:34:28 +0200
commita7d1b0dd42e27785636db09b94a8fed834edebab (patch)
treefb237c8fa49e71d025cc6b92515929c4ec47b0b7 /DistUpgrade
parent7e1ee3827be2a20fc4175315890be898123732fd (diff)
downloadpython-apt-a7d1b0dd42e27785636db09b94a8fed834edebab.tar.gz
* UpdateManager/Common/aptsources.py:
- use self.source_code_sources when enabling a component * DistUpgrade/DistUpgradeControler.py: - make sure to enable restricted as well otherwise the kernel won't upgrade
Diffstat (limited to 'DistUpgrade')
-rw-r--r--DistUpgrade/DistUpgradeControler.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 56ec7f08..ad4e5335 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -165,7 +165,12 @@ class DistUpgradeControler(object):
# enable main (we always need this!)
distro = Distribution()
distro.get_sources(self.sources)
+ # we need both main + restricted for a real upgrade
+ # restricted is required for the kernel upgrade (otherwise
+ # it will just keep the kernel because linux-$arch depends on
+ # linux-restricted-modules from restricted)
distro.enable_component(self.sources, "main")
+ distro.enable_component(self.sources, "restricted")
# 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