Replace deprecated mwclient method

[fdroidserver.git] / buildserver / provision-apt-get-install

diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install
index 5338dfd5f7570338b46fc56cf666eaca12481b79..c6b40e5e97d4ec7627f64a34aa6780be28e44067 100644 (file)
--- a/buildserver/provision-apt-get-install
+++ b/buildserver/provision-apt-get-install
@@ -6,14 +6,22 @@ set -x
 
 debian_mirror=$1
 
-sed -i "s,http://ftp.uk.debian.org/debian/,${debian_mirror},g" /etc/apt/sources.list
-
 printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \
        > /etc/apt/apt.conf.d/99no-install-recommends
 
 printf 'APT::Acquire::Retries "20";\n' \
        > /etc/apt/apt.conf.d/99acquire-retries
 
+printf 'APT::Periodic::Update-Package-Lists "0";\nAPT::Periodic::Unattended-Upgrade "0";\n' \
+       > /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 install apt-transport-https
+fi
+
+sed -i "s,http://ftp.uk.debian.org/debian/,${debian_mirror},g" /etc/apt/sources.list
+
 if grep --quiet jessie /etc/apt/sources.list; then
     echo "deb $debian_mirror jessie-backports main" > /etc/apt/sources.list.d/backports.list
     echo "deb $debian_mirror testing main" > /etc/apt/sources.list.d/testing.list
@@ -32,21 +40,21 @@ packages="
  ant-contrib
  autoconf
  autoconf2.13
- automake
+ automake/testing
  automake1.11
  autopoint
  bison
  bzr
  ca-certificates-java/jessie-backports
- cmake
+ cmake/jessie-backports
  curl
  expect
  faketime
  flex
  gettext/jessie-backports
  gettext-base/jessie-backports
- git-core
- git-svn
+ git-core/jessie-backports
+ git-svn/jessie-backports
  gperf
  graphviz
  imagemagick
@@ -56,6 +64,7 @@ packages="
  libexpat1-dev
  libgcc1:i386
  libglib2.0-dev
+ liblwp-protocol-https-perl
  liblzma-dev
  libncurses5:i386
  librsvg2-bin
@@ -66,7 +75,7 @@ packages="
  libtool-bin/testing
  make
  maven
- mercurial
+ mercurial/jessie-backports
  nasm
  nodejs
  openjdk-8-jre-headless
@@ -80,13 +89,18 @@ packages="
  python-lxml
  python-magic
  python-setuptools
+ python3-git/jessie-backports
+ python3-gitdb/jessie-backports
  python3-gnupg
+ python3-pyasn1
+ python3-pyasn1-modules
  python3-requests
+ python3-smmap/jessie-backports
  python3-yaml
- qt5-default
- qtbase5-dev
+ python3-ruamel.yaml
  quilt
  realpath
+ rsync
  scons
  sqlite3
  subversion