diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-09 22:50:52 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-09 22:50:52 +0100 |
| commit | 334e857644ec520279c90e8bc1cdbbf5116b621e (patch) | |
| tree | b4745f31950953258046771804d3bcb0c94771fa /DistUpgrade | |
| parent | 2cf4e28059f008a39fd90902aa5e4d36fa6c727e (diff) | |
| download | python-apt-334e857644ec520279c90e8bc1cdbbf5116b621e.tar.gz | |
* small fixes
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 16 | ||||
| -rw-r--r-- | DistUpgrade/TODO | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index cf82b9af..63dfbbf7 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -76,10 +76,11 @@ class DistUpgradeControler(object): self.cache = None # some constants here - #self.fromDist = "hoary" - #self.toDist = "breezy" - self.fromDist = "breezy" - self.toDist = "dapper" + self.fromDist = "hoary" + self.toDist = "breezy" + #self.fromDist = "breezy" + #self.toDist = "dapper" + self.origin = "Ubuntu" # a list of missing pkg names in the current install that neesd to @@ -302,12 +303,13 @@ class DistUpgradeControler(object): self.openCache() # check out what packages are cruft now # use self.{foreign,obsolete}_pkgs here and see what changed - now_obsolete = self._getObsoletesPkgs() - self.obsolete_pkgs - now_foreign = self._getForeignPkgs() - self.foreign_pkgs + now_obsolete = self._getObsoletesPkgs() + now_foreign = self._getForeignPkgs() logging.debug("Obsolete: %s" % " ".join(now_obsolete)) logging.debug("Foreign: %s" % " ".join(now_foreign)) + # mark the cruft as delete - for pkgname in now_obsolete: + for pkgname in (self.obsolete_pkgs - now_obsolete): self.cache[pkgname].markDelete() if self._view.confirmChanges(_("Remove obsolete Packages?"), self.cache.getChanges(), 0): diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO index e3fbc452..b064c379 100644 --- a/DistUpgrade/TODO +++ b/DistUpgrade/TODO @@ -10,5 +10,6 @@ - logging for the dpkg install run - send a "\n" on the libc6 question on hoary->breezy +- deal with ioexpetion during pkg download - check authentication and don't upgrade anything that is not authenticated (maybe just comment unauthenticated stuff out?) |