* merged with michael

3 files changed, 16 insertions, 3 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"])
         
diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py
index 42904444..eff05f35 100755
--- a/DistUpgrade/dist-upgrade.py
+++ b/DistUpgrade/dist-upgrade.py
@@ -7,13 +7,14 @@ import os
 
 if __name__ == "__main__":
 
-    view = GtkDistUpgradeView()
-    app = DistUpgradeControler(view)
-
     logging.basicConfig(level=logging.DEBUG,
                         filename=os.path.expanduser("~/dist-upgrade.log"),
                         format='%(asctime)s %(levelname)s %(message)s',
                         filemode='w')
+
+    view = GtkDistUpgradeView()
+    app = DistUpgradeControler(view)
+
     app.run()
 
     # testcode to see if the bullets look nice in the dialog
diff --git a/DistUpgrade/forced_obsoletes.txt b/DistUpgrade/forced_obsoletes.txt
new file mode 100644
index 00000000..1941b867
--- /dev/null
+++ b/DistUpgrade/forced_obsoletes.txt
@@ -0,0 +1 @@
+xscreensaver