Bug#605640: apt-setup: Using squeeze-updates for "volatile"

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

Package: apt-setup
Version: 0.49
Tags: patch

Hi,

Starting with the squeeze release, the volatile repository will be
replaced by the $dist-updates suite, which will be carried on the
standard ftp.d.o mirrors instead of residing on volatile.d.o.

As discussed on IRC, please find attached a patch that adds support for
this to apt-setup.  This has been tested using the November 29th weekly
d-i ISO with the updated udebs for apt-setup injected in to it (and
generators/90services-select hacked so that volatile was selectable for
an install of testing) and a "standard" (i.e. non-expert mode) install.

Also as discussed, I've not touched the debconf templates whilst
preparing the patch.  This does mean that the on-screen text does not
quite match what actually happens, but that's preferable to Christian
hunting me down. :-)

There is an issue with the patch, in that it doesn't handle installs
where no network mirror has been selected; I thought it was better to
have the patch available "as-is" though.  Suggestions for how to handle
that case welcome.

Regards,

Adam

diff -Nru apt-setup-0.49/generators/92volatile apt-setup-0.50/generators/92volatile
--- apt-setup-0.49/generators/92volatile	2009-07-23 17:53:14.000000000 +0100
+++ apt-setup-0.50/generators/92volatile	2010-12-02 00:50:03.000000000 +0000
@@ -18,6 +18,15 @@
 	codename="$RET"
 	db_get mirror/suite
 	suite="$RET"
+
+	if [ "$codename" != "lenny" ]; then
+		db_get mirror/protocol
+		protocol="$RET"
+		db_get mirror/$protocol/hostname
+		host="$RET"
+		db_get mirror/$protocol/directory
+		directory="/${RET#/}"
+	fi
 else
 	db_get cdrom/codename
 	codename="$RET"
@@ -35,7 +44,11 @@
 done
 
 # Don't test mirror if no network selected in netcfg
-echo "deb http://$host/debian-volatile $codename/volatile $dists" >> $file
+if [ "$codename" = "lenny" ]; then
+	echo "deb http://$host/debian-volatile $codename/volatile $dists" >> $file
+else
+	echo "deb $protocol://${host}${directory} ${codename}-updates $dists" >> $file
+fi
 if db_get netcfg/dhcp_options && \
    [ "$RET" = "Do not configure the network at this time" ]; then
 	CODE=9
@@ -52,6 +65,10 @@
 	fi
 fi
 
-echo "deb-src http://$host/debian-volatile $codename/volatile $dists" >> $file
+if [ "$codename" = "lenny" ]; then
+	echo "deb-src http://$host/debian-volatile $codename/volatile $dists" >> $file
+else
+	echo "deb-src $protocol://${host}${directory} ${codename}-updates $dists" >> $file
+fi
 
 exit $CODE