From 93442d09cff0eadfc18b17793c24789dac094600 Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Sun, 1 Jun 2025 14:23:40 +0200 Subject: [PATCH] debian: software-properties-common isn't in testing The software-properties-common pkg didn't make it into testing/trixie so far, see [0] and [1]. [0] https://tracker.debian.org/news/1579223/software-properties-removed-from-testing/ [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1038747#39 Signed-off-by: Dr. Jens Harbott Change-Id: I62cd753312b0838f5722a5d538af2d1759346166 --- .../elements/base/pre-install.d/03-baseline-tools | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diskimage_builder/elements/base/pre-install.d/03-baseline-tools b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools index 0d47ac9b9..8dac83ed8 100755 --- a/diskimage_builder/elements/base/pre-install.d/03-baseline-tools +++ b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools @@ -12,6 +12,9 @@ case $DISTRO_NAME in # Note: add-apt-repository would be nice for RPM platforms too - so when we # need something like it, create a wrapper in dpkg/bin and fedora/bin. apt-get -y update - install-packages software-properties-common apt-transport-https + install-packages apt-transport-https + if ! [[ $DIB_RELEASE =~ ^(testing|trixie|unstable) ]]; then + install-packages software-properties-common + fi ;; esac