From 33a6e2a979470ae9bbe401ff4b43adb1cba5f22e Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Wed, 9 Aug 2023 19:20:55 +0200
Subject: [PATCH] some more apt configs, which used to be used on the fly

---
 bundles/apt/items.py    | 2 +-
 bundles/apt/metadata.py | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bundles/apt/items.py b/bundles/apt/items.py
index d524690..0788a87 100644
--- a/bundles/apt/items.py
+++ b/bundles/apt/items.py
@@ -66,7 +66,7 @@ files = {
 
 actions = {
     'apt_update': {
-        'command': 'apt-get update -o APT::Update::Error-Mode=any',
+        'command': 'apt-get update',
         'needed_by': {
             'pkg_apt:',
         },
diff --git a/bundles/apt/metadata.py b/bundles/apt/metadata.py
index 830e47f..03e77f3 100644
--- a/bundles/apt/metadata.py
+++ b/bundles/apt/metadata.py
@@ -8,6 +8,11 @@ defaults = {
                 'Post-Invoke': {
                     '/bin/rm -f /var/cache/apt/archives/*.deb || true',
                 },
+                'Options': {
+                    # https://unix.stackexchange.com/a/642541/357916
+                    '--force-confold',
+                    '--force-confdef',
+                },
             },
             'APT': {
                 'NeverAutoRemove': {
@@ -30,6 +35,10 @@ defaults = {
                     'tasks',
                 },
                 'Move-Autobit-Sections': 'oldlibs',
+                'Update': {
+                    # https://unix.stackexchange.com/a/653377/357916
+                    'Error-Mode': 'any',
+                },
             },
         },
         'sources': {},