mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-03-30 04:44:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'apt_get_update' into 'master'

Browse Source 
provisioners: work around apt-get update problem

See merge request fdroid/fdroidserver!590
This commit is contained in:
Hans-Christoph Steiner
2018-10-24 11:53:24 +00:00
parent 15d422b01b 10e3165e41
commit 568256f75c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildserver/provision-apt-get-install
View File

@@ -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

2
buildserver/provision-apt-proxy
View File

@@ -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