From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 11 Apr 2011 08:56:00 +0000 (+0000)
Subject: Avoid --keyring opt for debootstrap. Fixes bug 4122
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=de7026840745bb1698be74a085f10f2336a90cdc;p=git-tools-moved-to-github.git

Avoid --keyring opt for debootstrap. Fixes bug 4122
---

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index 933fbe1..8d16d2b 100644
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -7,7 +7,8 @@
 : ${ARCH:=$(dpkg --print-architecture)}
 NAME="$DIST-$ARCH"
 DISTRIBUTION="$DIST"
-DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")
+# We avoid keyring in assignment below. bug 4122
+DEBOOTSTRAPOPTS=("--arch" "$ARCH" --variant=buildd)
 BASETGZ="`dirname $BASETGZ`/$NAME-base.tgz"
 #BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
 BUILDRESULT="$NAME"