diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-10 00:24:43 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-10 00:24:43 +0100 |
| commit | a9ffe769420085bce15259799654970e437eaa66 (patch) | |
| tree | 8a12c8625eff8b6e7cfa5376af0035d8fad13c1a /DistUpgrade | |
| parent | 334e857644ec520279c90e8bc1cdbbf5116b621e (diff) | |
| download | python-apt-a9ffe769420085bce15259799654970e437eaa66.tar.gz | |
* fixes in the obsoletes calculation
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |
