diff options
| author | Kefu Chai <kchai@redhat.com> | 2018-09-28 05:45:03 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2018-09-28 05:52:39 +0200 |
| commit | 3911a7c7d068fde7c1ea7b1a2af0063e1249d697 (patch) | |
| tree | 948d84b42a64df9840c85412c550cc7b7d4396dc /install-deps.sh | |
| parent | Merge pull request #22659 from theanalyst/cmake-pybind-ssl (diff) | |
| download | ceph-3911a7c7d068fde7c1ea7b1a2af0063e1249d697.tar.xz ceph-3911a7c7d068fde7c1ea7b1a2af0063e1249d697.zip | |
install-deps: do not specify unknown options
per apt.conf(5), and
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550564,
"Acquire::Translation" is not documented and will be deprecated. it
would be better to use "Acquire::Languages" solely. and it's consistent
with https://github.com/ceph/ceph-build/pull/1137 .
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'install-deps.sh')
| -rwxr-xr-x | install-deps.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/install-deps.sh b/install-deps.sh index 31cd4d69d89..10d4d1381b9 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -57,9 +57,9 @@ function ensure_decent_gcc_on_ubuntu { if [ ! -f /usr/bin/g++-${new} ]; then $SUDO tee /etc/apt/sources.list.d/ubuntu-toolchain-r.list <<EOF -deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $codename main -deb [arch=amd64] http://mirror.cs.uchicago.edu/ubuntu-toolchain-r $codename main -deb [arch=amd64,i386] http://mirror.yandex.ru/mirrors/launchpad/ubuntu-toolchain-r $codename main +deb [lang=none] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $codename main +deb [arch=amd64 lang=none] http://mirror.cs.uchicago.edu/ubuntu-toolchain-r $codename main +deb [arch=amd64,i386 lang=none] http://mirror.yandex.ru/mirrors/launchpad/ubuntu-toolchain-r $codename main EOF # import PPA's signing key into APT's keyring cat << ENDOFKEY | $SUDO apt-key add - @@ -77,7 +77,7 @@ msyaQpNl/m/lNtOLhR64v5ZybofB2EWkMxUzX8D/FQ== =LcUQ -----END PGP PUBLIC KEY BLOCK----- ENDOFKEY - $SUDO env DEBIAN_FRONTEND=noninteractive apt-get update -y -o Acquire::Languages=none -o Acquire::Translation=none || true + $SUDO env DEBIAN_FRONTEND=noninteractive apt-get update -y || true $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y g++-7 fi |