From 1492b1ce8736568b3171ca355700baac6c3a2072 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 27 Feb 2015 17:40:49 +0100
Subject: reproducible: fixup experimental pbuilder base.tgz creation

---
 bin/reproducible_setup_pbuilder.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'bin/reproducible_setup_pbuilder.sh')

diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index 66c37f67..bf93eb3b 100755
--- a/bin/reproducible_setup_pbuilder.sh
+++ b/bin/reproducible_setup_pbuilder.sh
@@ -23,11 +23,6 @@ fi
 create_setup_tmpfile() {
 	TMPFILE=$1
 	shift
-	if [ "$1" = "experimental" ] ; then
-		EXTRA="echo 'deb $MIRROR experimental main' > /etc/apt/sources.list.d/experimental.list
-echo 'deb-src $MIRROR experimental main' >> /etc/apt/sources.list.d/experimental.list"
-		shift
-	fi
 	cat > $TMPFILE <<- EOF
 #
 # this script is run within the pbuilder environment to further customize it
@@ -62,7 +57,6 @@ Mb0BawlXZui0MNUSnZtxHMxrjejdvZdqtskHl9srB1QThH0jasmUqbQPxCnxMbf1
 =X8YA
 -----END PGP PUBLIC KEY BLOCK-----" | apt-key add -
 echo 'deb http://reproducible.alioth.debian.org/debian/ ./' > /etc/apt/sources.list.d/reproducible.list
-$EXTRA
 apt-get update
 apt-get install -y $@
 echo
@@ -88,7 +82,8 @@ setup_pbuilder() {
 	LOG=$(mktemp)
 	if [ "$SUITE" = "experimental" ] ; then
 		SUITE=sid
-		PACKAGES="experimental $PACKAGES"
+		echo "echo 'deb $MIRROR experimental main' > /etc/apt/sources.list.d/experimental.list" > ${TMPFILE}
+		echo "echo 'deb-src $MIRROR experimental main' >> /etc/apt/sources.list.d/experimental.list" >> ${TMPFILE}
 	fi
 	create_setup_tmpfile ${TMPFILE} "${PACKAGES}"
 	sudo pbuilder --create --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE
-- 
cgit v1.2.3-54-g00ecf