diff -Nru update-manager-0.59.25/debian/changelog update-manager-0.59.26/debian/changelog --- update-manager-0.59.25/debian/changelog 2007-09-19 21:51:54.000000000 +0200 +++ update-manager-0.59.26/debian/changelog 2008-06-24 22:51:22.000000000 +0200 @@ -1,3 +1,10 @@ +update-manager (1:0.59.26) feisty-proposed; urgency=low + + * support old-releases.ubuntu.com (LP: #241431) to make + the transition from edgy to feisty work + + -- Michael Vogt Tue, 24 Jun 2008 22:50:35 +0200 + update-manager (1:0.59.25) feisty-proposed; urgency=low * fix missing imports (LP: #141060) diff -Nru /tmp/MzBlzwxoa1/update-manager-0.59.25/DistUpgrade/DistUpgradeControler.py /tmp/Nn23HRgpwP/update-manager-0.59.26/DistUpgrade/DistUpgradeControler.py --- update-manager-0.59.25/DistUpgrade/DistUpgradeControler.py 2007-04-24 15:39:40.000000000 +0200 +++ update-manager-0.59.26/DistUpgrade/DistUpgradeControler.py 2008-06-24 22:54:46.000000000 +0200 @@ -348,6 +348,16 @@ elif entry.uri.startswith("cdrom:"): continue + # special case for old-releases.ubuntu.com, auto transition + # them back to archive.ubuntu.com - now this is a problem + # of course for people upgrading from EOL release to a + # EOL release + if (not entry.disabled and + entry.uri.startswith("http://old-releases.ubuntu.com/ubuntu")): + entry.uri = "http://archive.ubuntu.com/ubuntu" + logging.debug("transitioning old-releases.ubuntu.com to '%s' " % entry) + continue + logging.debug("examining: '%s'" % entry) # check if it's a mirror (or offical site) validMirror = False diff -Nru /tmp/MzBlzwxoa1/update-manager-0.59.25/DistUpgrade/mirrors.cfg /tmp/Nn23HRgpwP/update-manager-0.59.26/DistUpgrade/mirrors.cfg --- update-manager-0.59.25/DistUpgrade/mirrors.cfg 2007-04-24 15:20:38.000000000 +0200 +++ update-manager-0.59.26/DistUpgrade/mirrors.cfg 2008-06-24 22:55:23.000000000 +0200 @@ -3,6 +3,8 @@ http://security.ubuntu.com/ubuntu/ ftp://archive.ubuntu.com/ubuntu/ ftp://security.ubuntu.com/ubuntu/ +http://old-releases.ubuntu.com/ +ftp://old-releases.ubuntu.com/ #commercial (both urls are valid http://archive.canonical.com