Skip to content

Commit 9cf1020

Browse files
committed
Trying again.
1 parent d851161 commit 9cf1020

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

ci/ci-setup

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if [ "${ID}" == "ubuntu" ] || [ "${ID}" == "debian" ] ; then
6666
if [ "${ID}" == "ubuntu" ] ; then
6767
# Add PPA dreibh/ppa for Ubuntu:
6868
DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef --no-install-recommends \
69-
software-properties-common
69+
software-properties-common gpg-agent
7070
apt-add-repository -y ppa:dreibh/ppa || true
7171
apt-get update -q
7272
fi
@@ -148,10 +148,9 @@ EOF
148148
OS="${OS}" DISTRIBUTION="${DIST}" ARCHITECTURE="${ARCH}" pbuilder create \
149149
--debootstrapopts --variant=buildd \
150150
| grep -v "^I: Retrieving\|^I: Validating\|^I: Unpacking\|^I: Extracting\|^I: Configuring\|^I: new cache content"
151-
# --debootstrapopts --keyring=/etc/apt/trusted.gpg
152151

153152
# Speed up pbuilder:
154-
echo "echo \"force-unsafe-io\" > /etc/dpkg/dpkg.cfg.d/02apt-speedup" | \
153+
echo "echo \"force-unsafe-io\" >/etc/dpkg/dpkg.cfg.d/02apt-speedup" | \
155154
OS="${OS}" DISTRIBUTION="${DIST}" ARCHITECTURE="${ARCH}" pbuilder login --save-after-exec
156155

157156
# ====== Add ppa:dreibh/ppa, updates and backports =================

0 commit comments

Comments
 (0)