* merged with michael

1 files changed, 11 insertions, 0 deletions

diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index e229a849..db6168ef 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -50,6 +50,15 @@ class DistUpgradeControler(object):
        
         self.origin = "Ubuntu"
 
+        # forced obsoletes
+        self.forced_obsoletes = []
+        for line in open("forced_obsoletes.txt").readlines():
+            line = line.strip()
+            if not line == "" or line.startswith("#"):
+                self.forced_obsoletes.append(line)
+        logging.debug("forced obsoletes '%s'" % line)
+
+
     def openCache(self):
         self.cache = MyCache(self._view.getOpCacheProgress())
 
@@ -210,6 +219,7 @@ class DistUpgradeControler(object):
         # before) to be deleted. make sure to not delete any foreign
         # (that is, not from ubuntu) packages
         remove_candidates = now_obsolete - self.obsolete_pkgs
+        remove_candidates |= set(self.forced_obsoletes)
         logging.debug("Start checking for obsolete pkgs")
         for pkgname in remove_candidates:
             if pkgname not in self.foreign_pkgs:
@@ -281,6 +291,7 @@ class DistUpgradeControler(object):
 
         # done, ask for reboot
         self._view.updateStatus(_("System upgrade is complete."))            
+        # FIXME should we look into /var/run/reboot-required here?
         if self._view.confirmRestart():
             subprocess.call(["reboot"])