From 10e3165e41f5a4e93a7b09cf98b9be1bbbd05b21 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 24 Oct 2018 13:06:27 +0200 Subject: [PATCH] provisioners: work around apt-get update problem --- buildserver/provision-apt-get-install | 4 ++-- buildserver/provision-apt-proxy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install index c0a231cf..5aaea442 100644 --- a/buildserver/provision-apt-get-install +++ b/buildserver/provision-apt-get-install @@ -16,7 +16,7 @@ printf 'APT::Periodic::Update-Package-Lists "0";\nAPT::Periodic::Unattended-Upgr > /etc/apt/apt.conf.d/99no-auto-updates if echo $debian_mirror | grep '^https' 2>&1 > /dev/null; then - apt-get -y update + apt-get -y update || apt-get -y update apt-get -y install apt-transport-https ca-certificates fi @@ -30,7 +30,7 @@ fi dpkg --add-architecture i386 -apt-get -y update +apt-get -y update || apt-get -y update apt-get -y upgrade --download-only apt-get -y upgrade diff --git a/buildserver/provision-apt-proxy b/buildserver/provision-apt-proxy index ec9a5ee8..9d42a2a4 100644 --- a/buildserver/provision-apt-proxy +++ b/buildserver/provision-apt-proxy @@ -8,4 +8,4 @@ echo "Acquire::ftp::Proxy \"$1\";" >> /etc/apt/apt.conf.d/02proxy echo "Acquire::http::Proxy \"$1\";" >> /etc/apt/apt.conf.d/02proxy echo "Acquire::https::Proxy \"$1\";" >> /etc/apt/apt.conf.d/02proxy -apt-get update +apt-get update || apt-get update