Avoid --keyring opt for debootstrap. Fixes bug 4122

[git-tools-moved-to-github.git] / id-deb-build / pbuilderrc

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index c3e49b5..8d16d2b 100644 (file)
--- 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"
@@ -15,7 +16,7 @@ APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
 
 # http://releases.ubuntu.com/releases/
 case "$DIST" in
-    karmic|intrepid|hardy|gutsy|jaunty) # ubuntu specific
+    maverick|lucid|karmic|intrepid|hardy|gutsy|jaunty) # ubuntu specific
        # MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
        MIRRORSITE="http://mirrors.telianet.dk/ubuntu/"
         # MIRRORSITE="http://mirrors.kernel.org/ubuntu/"