Package: auto-apt-proxy
Version: 13.3
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu impish ubuntu-patch
X-Debbugs-Cc: j...@debian.org
In Ubuntu, the attached patch was applied to achieve the following:
* Pass -o Acquire::Retries=0 to apt-helper, such that apt doesn't retry
the proxy probing, which now has exponential backoff in 2.3.7
This is needed for apt 2.3.7, otherwise the timeout test fails.
Thanks for considering the patch.
We detected this because the timeout test failed. It's worth pointing
out that the timeout test can still fail if `getent hosts apt-proxy`
takes longer than around 10s. On my laptop it takes 20s.
-- System Information:
Debian Release: 11.0
APT prefers impish
APT policy: (500, 'impish'), (500, 'hirsute-updates'), (500,
'hirsute-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.13.0-14-generic (SMP w/8 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to
C.UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
debian developer - deb.li/jak | jak-linux.org - free software dev
ubuntu core developer i speak de, en
diff -Nru auto-apt-proxy-13.3/auto-apt-proxy
auto-apt-proxy-13.3ubuntu1/auto-apt-proxy
--- auto-apt-proxy-13.3/auto-apt-proxy 2021-06-19 03:51:34.000000000 +0200
+++ auto-apt-proxy-13.3ubuntu1/auto-apt-proxy 2021-08-13 13:30:14.000000000
+0200
@@ -26,7 +26,7 @@
hit() {
timeout 5 /usr/lib/apt/apt-helper \
- -o Acquire::http::Proxy=DIRECT \
+ -o Acquire::http::Proxy=DIRECT -o Acquire::Retries=0 \
download-file "$@" "$tmpfile" 2>&1
}
