summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DistUpgrade/DistUpgradeCache.py8
-rw-r--r--debian/changelog2
2 files changed, 5 insertions, 5 deletions
diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py
index 7d0d27e0..2e21d05d 100644
--- a/DistUpgrade/DistUpgradeCache.py
+++ b/DistUpgrade/DistUpgradeCache.py
@@ -202,16 +202,16 @@ class MyCache(apt.Cache):
# upgrade (and make sure this way that the cache is ok)
self.upgrade(True)
- # then see if meta-pkgs are missing
- if not self._installMetaPkgs(view):
- raise SystemError, _("Can't upgrade required meta-packages")
-
# see if our KeepInstalled rules are honored
self.keepInstalledRule()
# and if we have some special rules
self.postUpgradeRule()
+ # then see if meta-pkgs are missing
+ if not self._installMetaPkgs(view):
+ raise SystemError, _("Can't upgrade required meta-packages")
+
# see if it all makes sense
if not self._verifyChanges():
raise SystemError, _("A essential package would have to be removed")
diff --git a/debian/changelog b/debian/changelog
index 721ed39b..4f9c7dd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ update-manager (0.44.17) edgy; urgency=low
* memory leak fixed (lp: #43096)
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 9 Oct 2006 15:24:40 +0200
update-manager (0.44.16) edgy; urgency=low