diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-26 23:34:28 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-26 23:34:28 +0200 |
| commit | a7d1b0dd42e27785636db09b94a8fed834edebab (patch) | |
| tree | fb237c8fa49e71d025cc6b92515929c4ec47b0b7 | |
| parent | 7e1ee3827be2a20fc4175315890be898123732fd (diff) | |
| download | python-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
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 5 | ||||
| -rw-r--r-- | UpdateManager/Common/aptsources.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 7 insertions, 2 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 diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index 0d716231..06d83e01 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -636,7 +636,7 @@ class Distribution: # now do the same for source dists if self.get_source_code == True: comps_per_dist = {} - for s in sources: + for s in self.source_code_sources: if s.type != "deb-src": continue if not comps_per_dist.has_key(s.dist): diff --git a/debian/changelog b/debian/changelog index d817dea3..2f067c0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ update-manager (0.44.14) edgy; urgency=low * DistUprade/DistUpgradeControler.py: - check for self.sources, self.aptcdrom before using it (lp: #61852) - -- + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 23:17:27 +0200 update-manager (0.44.13) edgy; urgency=low |