aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/tests/build-procenv5
-rw-r--r--debian/tests/control2
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/tests/build-procenv b/debian/tests/build-procenv
index bab2824..218db38 100644
--- a/debian/tests/build-procenv
+++ b/debian/tests/build-procenv
@@ -35,10 +35,12 @@ if [ "$distro" = debian ] ; then
release=$(distro-info --testing)
components="main"
mirror="http://httpredir.debian.org/debian"
+ keyring="/usr/share/keyrings/debian-archive-keyring.gpg"
elif [ "$distro" = ubuntu ] ; then
release=$(distro-info --devel)
components="main universe"
mirror="http://archive.ubuntu.com/ubuntu"
+ keyring="/usr/share/keyrings/ubuntu-archive-keyring.gpg"
else
die "need to know where archive is for distro '$distro'"
fi
@@ -46,10 +48,11 @@ fi
# Have to redirect stderr to avoid ADT thinking the test has failed
# (the return code is still being checked, so this seems reasonable).
echo "INFO: Creating pbuilder chroot for release '$release'"
-echo "+ pbuilder --create --debug --distribution $release --components '$components' --mirror '$mirror'"
+echo "+ pbuilder --create --debug --distribution '$release' --components '$components' --debootstrapopts --keyring='$keyring' --mirror '$mirror'"
pbuilder --create --debug \
--distribution "$release" \
--components "$components" \
+ --debootstrapopts --keyring="$keyring" \
--mirror "$mirror" 2>&1
if [ ! -d "$resultdir" ] ; then
diff --git a/debian/tests/control b/debian/tests/control
index ac186d2..5caf738 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
Tests: build-procenv
-Depends: @, debian-keyring, distro-info, lsb-release
+Depends: @, debian-keyring, distro-info, lsb-release, ubuntu-archive-keyring | ubuntu-keyring
Restrictions: needs-root