* DistUpgrade/DistUpgradeCache.py, DistUpgrade/DistUpgradeControler.py:

  - make the warnings from apt go away
* DistUpgrade/dist-upgrade.py:
  - make sure to run under a segv handler and write faults to
    /var/log/dist-upgrade-segv.log
* DistUpgrade/ReleaseAnnouncement:
  - point to RC1

5 files changed, 25 insertions, 3 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index 3746c871..13f3fe06 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,6 @@
+2006-05-30: 
+	- added a segv handler that writes into 
+          /var/log/dist-upgrade-segv.log
 2006-05-24: 
 	- if the initial "update()" fails, just exit, don't try
           to restore the old sources.list (nothing was modified yet)
@@ -10,6 +13,7 @@
 	- translations updated from rosetta
 	- fixed a bug in the demotions calculation (ubuntu: #46245)
 	- typos fixed and translations unfuzzied (ubuntu: #46792,#46464)
+	- upload
 2006-05-12: 
 	- space checking improved (ubuntu: #43948)
         - show software that was demoted from main -> universe 
diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py
index 96b8517d..c9cdfad3 100644
--- a/DistUpgrade/DistUpgradeCache.py
+++ b/DistUpgrade/DistUpgradeCache.py
@@ -1,4 +1,6 @@
 
+import warnings
+warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
 import apt
 import apt_pkg
 import os
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 3d1c7e3e..9ab18523 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -20,6 +20,8 @@
 #  USA
 
 
+import warnings
+warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
 import apt
 import apt_pkg
 import sys
diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement
index acc5fce9..292ade07 100644
--- a/DistUpgrade/ReleaseAnnouncement
+++ b/DistUpgrade/ReleaseAnnouncement
@@ -1,6 +1,5 @@
-The Ubuntu team is proud to announce a test version of Ubuntu 6.06 LTS.
-
-* THIS IS A DEVELOPMENT SNAPSHOT *
+The Ubuntu team is proud to announce a Release Candidate of 
+Ubuntu 6.06 LTS.
 
 Ubuntu is a Linux distribution for your desktop or server, with a 
 fast and easy install, regular releases, a tight selection of 
diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py
index 632de54d..6b388532 100755
--- a/DistUpgrade/dist-upgrade.py
+++ b/DistUpgrade/dist-upgrade.py
@@ -4,15 +4,30 @@ from DistUpgradeControler import DistUpgradeControler
 from DistUpgradeConfigParser import DistUpgradeConfig
 import logging
 import os
+import os.path
 import sys
 
 if __name__ == "__main__":
 
+    # init logging
     logging.basicConfig(level=logging.DEBUG,
                         filename="/var/log/dist-upgrade.log",
                         format='%(asctime)s %(levelname)s %(message)s',
                         filemode='w')
 
+    # make sure we run under a segv-handler
+    if not os.environ.has_key("LD_PRELOAD") or \
+           not "libSegFault" in os.environ["LD_PRELOAD"]:
+        fd = os.open("/var/log/dist-upgrade-segv.log",
+                     os.O_RDWR|os.O_CREAT|os.O_TRUNC)
+        os.dup2(fd,1)
+        os.dup2(fd,2)
+        # restart ourself
+        os.execl("/usr/bin/catchsegv", "catchsegv", sys.argv[0])
+    else:
+        logging.debug("Runing with segv-handler: %s", os.environ["LD_PRELOAD"])
+
+    # init config and get a view
     config = DistUpgradeConfig()
     requested_view= config.get("View","View")
     try: