diff -r 6952d42f9158 -r d1d919f679f7 contrib/automation/hgautomation/linux.py --- a/contrib/automation/hgautomation/linux.py Sun Sep 29 11:24:14 2019 -0700 +++ b/contrib/automation/hgautomation/linux.py Sun Sep 29 11:29:25 2019 -0700 @@ -21,6 +21,7 @@ # Linux distributions that are supported. DISTROS = { 'debian9', + 'debian10', 'ubuntu18.04', 'ubuntu19.04', } @@ -190,14 +191,18 @@ cat << EOF | sudo tee -a /etc/apt/sources.list # Need backports for clang-format-6.0 deb http://deb.debian.org/debian stretch-backports main +EOF +fi +if [ "$LSB_RELEASE" = "stretch" -o "$LSB_RELEASE" = "buster" ]; then +cat << EOF | sudo tee -a /etc/apt/sources.list # Sources are useful if we want to compile things locally. -deb-src http://deb.debian.org/debian stretch main -deb-src http://security.debian.org/debian-security stretch/updates main -deb-src http://deb.debian.org/debian stretch-updates main -deb-src http://deb.debian.org/debian stretch-backports main +deb-src http://deb.debian.org/debian $LSB_RELEASE main +deb-src http://security.debian.org/debian-security $LSB_RELEASE/updates main +deb-src http://deb.debian.org/debian $LSB_RELEASE-updates main +deb-src http://deb.debian.org/debian $LSB_RELEASE-backports main -deb [arch=amd64] https://download.docker.com/linux/debian stretch stable +deb [arch=amd64] https://download.docker.com/linux/debian $LSB_RELEASE stable EOF elif [ "$DISTRO" = "Ubuntu" ]; then @@ -279,8 +284,8 @@ PACKAGES="$PACKAGES linux-tools-common" fi -# Ubuntu 19.04 removes monotone. -if [ "$LSB_RELEASE" != "disco" ]; then +# Monotone only available in older releases. +if [ "$LSB_RELEASE" = "stretch" -o "$LSB_RELEASE" = "xenial" ]; then PACKAGES="$PACKAGES monotone" fi