* DistUpgrade/DistUpgradeViewGtk.py:

  - fix bug in the media-change code
* DistUpgrade/TODO: udpated
* DistUpgrade/mirrors.txt: added ftp.belnet.be

4 files changed, 12 insertions, 4 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index c450d99d..267cb9c6 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,7 @@
+2006-05-08: 
+	- fix error when asking for media-change (ubuntu: 43442)
+2006-05-02: 
+        - upload
 2006-04-28:
         - add more sanity checking, if no valid mirror is found in the 
           sources.list ask for "dumb" rewrite
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index ed4efc31..80575859 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -73,10 +73,11 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
         # if this is set to false the download will cancel
         self.status = parent.label_status
         self.progress = parent.progressbar_cache
+        self.parent = parent
     def mediaChange(self, medium, drive):
       #print "mediaChange %s %s" % (medium, drive)
       msg = _("Please insert '%s' into the drive '%s'" % (medium,drive))
-      dialog = gtk.MessageDialog(parent=self.window_main,
+      dialog = gtk.MessageDialog(parent=self.parent.window_main,
                                  flags=gtk.DIALOG_MODAL,
                                  type=gtk.MESSAGE_QUESTION,
                                  buttons=gtk.BUTTONS_OK_CANCEL)
diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO
index 9c4f503c..fd29d52d 100644
--- a/DistUpgrade/TODO
+++ b/DistUpgrade/TODO
@@ -1,12 +1,12 @@
 MUSTFIX:
 --------
+
 * debconf gnome dosn't work (can't connect to the session)
   [ should be fixed with the bugfix on gksu ]
 * display a message that all applications should be closed for the 
   dist-upgrade (and that strange things like a crashing panel can
   happen)
   [done in current dialog]
-
 * sources.list edit needs to add valid sources if all other sources
   are commented out
   (or for sources that can't be identified and rewrite ask the user
@@ -16,8 +16,7 @@ MUSTFIX:
   [Done]
 * fix "no activity for 120s warning" being repeated every sec in the logs
   [Done]
-* use the dialog frontend (for debconf) and detect the ansi sequence that
-  clear the screen and expand the terminal then 
+
 * [fabbio]: we probably don't want to remove stuff that moved from main
   to universe (if the user has only main enabled this is considered 
   obsolete). It would also be nice inform about packages that went from
@@ -28,6 +27,8 @@ MUSTFIX:
                         text (as \n\n\n\n\n... for cls)
 * add "add cdrom" to the "Do upgrade?" screen? And recalc the download 
   size again then :) ?
+* set bigger timeout than 120s?
+* make the sources.list rewrite even more robust (see launchpad #41023)
 
 breezy->dapper
 --------------
diff --git a/DistUpgrade/mirrors.txt b/DistUpgrade/mirrors.txt
index e18f3616..16b25731 100644
--- a/DistUpgrade/mirrors.txt
+++ b/DistUpgrade/mirrors.txt
@@ -31,9 +31,11 @@ rsync://gd.tuwien.ac.at/ubuntu/archive/
 
 #===Belgium===
 http://ftp.belnet.be/pub/mirror/ubuntu.com/
+http://ftp.belnet.be/packages/ubuntu/ubuntu
 http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/
 http://mirror.freax.be/ubuntu/archive.ubuntu.com/
 ftp://ftp.belnet.be/pub/mirror/ubuntu.com/
+ftp://ftp.belnet.be/packages/ubuntu/ubuntu
 ftp://ubuntu.mirrors.skynet.be/pub/ubuntu.com/
 
 #===Brazil===