From 7b6789ddeb74450f70991efe957e3eb0f11043f6 Mon Sep 17 00:00:00 2001
From: Matthias Stecher <matthiasstecher@gmx.de>
Date: Wed, 15 Sep 2021 15:04:12 +0200
Subject: [PATCH] __package_update_index: fix complain about suite change
2 of 4th fix for ticket #861
---
.../type/__package_update_index/gencode-remote | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/cdist/conf/type/__package_update_index/gencode-remote b/cdist/conf/type/__package_update_index/gencode-remote
index 803468b5..a10c16d3 100755
--- a/cdist/conf/type/__package_update_index/gencode-remote
+++ b/cdist/conf/type/__package_update_index/gencode-remote
@@ -41,7 +41,19 @@ fi
case "$type" in
yum) ;;
apt)
- echo "apt-get --quiet update"
+ # There are special arguments to apt(8) to prevent aborts if apt woudn't been
+ # updated after the 19th April 2021 till the bullseye release. The additional
+ # arguments acknoledge the happend suite change (the apt(8) update does the
+ # same by itself).
+ #
+ # Using '-o $config' instead of the --allow-releaseinfo-change-* parameter
+ # allows backward compatablility to pre-buster Debian versions.
+ #
+ # See more: ticket #861
+ # https://code.ungleich.ch/ungleich-public/cdist/-/issues/861
+ apt_opts="-o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Version=true"
+
+ echo "apt-get --quiet $apt_opts update"
echo "apt-cache updated (age was: $currage)" >> "$__messages_out"
;;
pacman)