summaryrefslogtreecommitdiff
path: root/DistUpgrade
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-02-02 16:08:13 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2006-02-02 16:08:13 +0000
commit00ef7226be8cea7332bb6ef43bcc11d48412ce78 (patch)
tree1b8aa9ffc2d32c3222738be3bcf9bcdeb7de57f7 /DistUpgrade
parent0f3e83010710cf3493c0c9f2bab16e5f028c114c (diff)
downloadpython-apt-00ef7226be8cea7332bb6ef43bcc11d48412ce78.tar.gz
* fix small problems in the per-meta-pkg obsoletes support
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 fd9a0cbe..4211c93b 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -233,6 +233,11 @@ class DistUpgradeControler(object):
now_foreign = self.cache._getForeignPkgs(self.origin, self.fromDist, self.toDist)
logging.debug("Obsolete: %s" % " ".join(now_obsolete))
logging.debug("Foreign: %s" % " ".join(now_foreign))
+
+ # now get the meta-pkg specific obsoletes
+ for pkg in self.config.getlist("Distro","MetaPkgs"):
+ if self.cache.has_key(pkg) and self.cache[pkg].isInstalled:
+ self.forced_obsoletes.extend(self.config.getlist(pkg,"ForcedObsoletes"))
# mark packages that are now obsolete (and where not obsolete
# before) to be deleted. make sure to not delete any foreign