From a9ffe769420085bce15259799654970e437eaa66 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Jan 2006 00:24:43 +0100 Subject: * fixes in the obsoletes calculation --- DistUpgrade/DistUpgradeControler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 63dfbbf7..950bbb67 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -259,7 +259,7 @@ class DistUpgradeControler(object): logging.debug("Install: %s" % " ".join(inst)) logging.debug("Upgrade: %s" % " ".join(up)) - def doPreUpgrade(self): + def doPreUpdate(self): # FIXME: check out what packages are downloadable etc to # compare the list after the update again self.obsolete_pkgs = self._getObsoletesPkgs() @@ -309,7 +309,7 @@ class DistUpgradeControler(object): logging.debug("Foreign: %s" % " ".join(now_foreign)) # mark the cruft as delete - for pkgname in (self.obsolete_pkgs - now_obsolete): + for pkgname in (now_obsolete - self.obsolete_pkgs): self.cache[pkgname].markDelete() if self._view.confirmChanges(_("Remove obsolete Packages?"), self.cache.getChanges(), 0): @@ -334,7 +334,7 @@ class DistUpgradeControler(object): sys.exit(1) # do pre-upgrade stuff (calc list of obsolete pkgs etc) - self.doPreUpgrade() + self.doPreUpdate() # update sources.list self._view.setStep(2) -- cgit v1.2.3