From 9ea5ac07c2a2b8806cc47088d02180e36df11730 Mon Sep 17 00:00:00 2001 From: Alessandro <155005371+3clyp50@users.noreply.github.com> Date: Tue, 23 Jun 2026 21:26:37 +0200 Subject: [PATCH] Handle Xpra fallback on amd64 Docker builds Use the same minimal trixie Xpra fallback package set for any architecture when the preferred Xpra repository is unsatisfiable. This lets amd64 recover from current xpra beta sid libopenjph dependency drift like arm64 already does. --- docker/run/fs/ins/install_additional.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/docker/run/fs/ins/install_additional.sh b/docker/run/fs/ins/install_additional.sh index 31546deaa..e9c844be7 100644 --- a/docker/run/fs/ins/install_additional.sh +++ b/docker/run/fs/ins/install_additional.sh @@ -46,16 +46,11 @@ install_xpra_repo() { apt-get update if ! xpra_install_check; then - if [ "$arch" != "amd64" ]; then - echo "xpra packages are not installable from ${uri} ${suite} for ${arch}; falling back to https://xpra.org trixie" - XPRA_PACKAGES=(xpra-server xpra-x11 xpra-html5) - configure_xpra_repo "https://xpra.org" "trixie" "$arch" - apt-get update - if ! xpra_install_check; then - cat /tmp/xpra-install-check.log - exit 1 - fi - else + echo "xpra packages are not installable from ${uri} ${suite} for ${arch}; falling back to https://xpra.org trixie" + XPRA_PACKAGES=(xpra-server xpra-x11 xpra-html5) + configure_xpra_repo "https://xpra.org" "trixie" "$arch" + apt-get update + if ! xpra_install_check; then cat /tmp/xpra-install-check.log exit 1 fi