summaryrefslogtreecommitdiff
path: root/DistUpgrade
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-10-17 19:08:03 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-10-17 19:08:03 +0200
commit75af4477ee82dd7782b064bfe425e49356701cac (patch)
tree21cb0292d464d02a9d98f6bb1fb1af25c6d64bc9 /DistUpgrade
parentad1e40b643860122971a0ab8d942e54851458347 (diff)
downloadpython-apt-75af4477ee82dd7782b064bfe425e49356701cac.tar.gz
* DistUpgrade/DistUpgradeCache.py:
- fix tomboy while we are at it anyway
Diffstat (limited to 'DistUpgrade')
-rw-r--r--DistUpgrade/Changelog3
-rw-r--r--DistUpgrade/DistUpgradeCache.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index 050fc615..45ef5edf 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,5 +1,6 @@
2006-10-17:
- - ensure bzr and xserver-xorg-input-* is properly upgraded
+ - ensure bzr, tomboy and xserver-xorg-input-* are properly
+ upgraded
- don't fail if dpkg sents unexpected status lines (lp: #66013)
2006-10-16:
- remove leftover references to ubuntu-base and
diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py
index bc79f9e2..a569bf37 100644
--- a/DistUpgrade/DistUpgradeCache.py
+++ b/DistUpgrade/DistUpgradeCache.py
@@ -188,7 +188,7 @@ class MyCache(apt.Cache):
logging.debug("Failed to apply %s fixup: %s (%s)" % (pkg.name, e))
# deal with held-backs that are unneeded
- for pkgname in ["hpijs", "bzr"]:
+ for pkgname in ["hpijs", "bzr", "tomboy"]:
if (self.has_key(pkgname) and self[pkgname].isInstalled and
not self[pkgname].markedUpgrade):
try: