summaryrefslogtreecommitdiff
path: root/DistUpgrade
diff options
context:
space:
mode:
Diffstat (limited to 'DistUpgrade')
-rw-r--r--DistUpgrade/DistUpgradeControler.py7
-rw-r--r--DistUpgrade/TODO2
2 files changed, 6 insertions, 3 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 950bbb67..d24a6287 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -308,9 +308,12 @@ class DistUpgradeControler(object):
logging.debug("Obsolete: %s" % " ".join(now_obsolete))
logging.debug("Foreign: %s" % " ".join(now_foreign))
- # mark the cruft as delete
+ # mark packages that are now obsolete (and where not obsolete
+ # before) to be deleted. make sure to not delete any foreign
+ # (that is, not from ubuntu) packages
for pkgname in (now_obsolete - self.obsolete_pkgs):
- self.cache[pkgname].markDelete()
+ if pkgname not in self.foreign_pkgs:
+ self.cache[pkgname].markDelete()
if self._view.confirmChanges(_("Remove obsolete Packages?"),
self.cache.getChanges(), 0):
fprogress = self._view.getFetchProgress()
diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO
index b064c379..9130f4c6 100644
--- a/DistUpgrade/TODO
+++ b/DistUpgrade/TODO
@@ -10,6 +10,6 @@
- logging for the dpkg install run
- send a "\n" on the libc6 question on hoary->breezy
-- deal with ioexpetion during pkg download
+- deal with io-expetion during pkg download
- check authentication and don't upgrade anything that is not
authenticated (maybe just comment unauthenticated stuff out?)