Merge lp:~pjdc/launchpad-buildd/chroot-scripts into lp:~lamont/launchpad-buildd/chroot-scripts

[Paul Collins]

Add --ubuntu-porter to replace IS use of "--dchroot --rapt", and also enable -proposed for Ubuntu porter chroots (cf. RT#76483).

{Resubmit: rebase and, importantly, fix the indentation of the here document.]

[lp:~pjdc/launchpad-buildd/chroot-scripts]

55. By LaMont Jones on 2014-11-19

merging add --ubuntu-porter to replace IS use of --dchroot --rapt, and also enable -proposed when --ubuntu-porter is specified, also adding --proposed for completness.

=== modified file 'make-chroot.sh'
--- make-chroot.sh	2013-06-20 16:11:43 +0000
+++ make-chroot.sh	2014-11-07 00:35:50 +0000
@@ -104,6 +104,7 @@
 schroot=yes
 schroot_used=""
 home=""
+proposed=""
 
 while [ $# -gt 0 ]
 do
@@ -127,6 +128,7 @@
  	    --nomangle)		pkgmangle=""; shift;;
 	    --debian)		debian=yes; shift;;				# building a debian chroot
  	    --xdebian)		debian=yes; xdebian=yes; shift;;		# cross-built debian
+	    --ubuntu-porter)	dchroot=yes; home=yes; proposed=yes; rapt=yes; shift;;
 	    --user)		buildduser=$2; shift; shift;;
 	    --noarchuser)	noarchuser=yes; shift;;
 	    --group)		builddgroup=$2; shift; shift;;
@@ -393,6 +395,13 @@
 		deb-src $srcurl $distro-updates main restricted universe multiverse
 		deb-src $srcurl $distro-security main restricted universe multiverse
 		EOF
+		if test -n "$proposed"; then
+			cat <<- EOF >&6
+
+			deb $deburl $distro-proposed main restricted universe multiverse
+			deb-src $srcurl $distro-proposed main restricted universe multiverse
+			EOF
+		fi
 	else
 		cat <<- EOF >&6
 		deb $deburl $distro main