updater: auto-resolve conffiles conflicts only if qubes-updater is used

previous version change behavior permanently
QubesOS · Oct 2, 2024 · 0d9f8a0 · 0d9f8a0
1 parent 009d2e4
commit 0d9f8a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 38 deletions.
diff --git a/vmupdate/agent/source/apt/apt_api.py b/vmupdate/agent/source/apt/apt_api.py
@@ -84,6 +84,8 @@ def upgrade_internal(self, remove_obsolete: bool) -> ProcessResult:
             Path(os.path.join(
                 apt_pkg.config.find_dir("Dir::Cache::Archives"), "partial")
             ).mkdir(parents=True, exist_ok=True)
+            apt_pkg.config.set('Dpkg::Options::', "--force-confdef")
+            apt_pkg.config.set('Dpkg::Options::', "--force-confold")
             self.log.debug("Committing upgrade...")
             self.apt_cache.commit(
                 self.progress.fetch_progress,

diff --git a/vmupdate/agent/source/apt/apt_cli.py b/vmupdate/agent/source/apt/apt_cli.py
@@ -91,7 +91,9 @@ def get_action(self, remove_obsolete: bool) -> List[str]:
         """
         Return command `upgrade` or `dist-upgrade` if `remove_obsolete`.
         """
-        result = ["-y"]
+        result = ["-y",
+                  "-o", 'Dpkg::Options::="--force-confdef"',
+                  "-o", 'Dpkg::Options::="--force-confold"']
         result += ["dist-upgrade"] if remove_obsolete else ["upgrade"]
         return result
 

diff --git a/vmupdate/agent/source/plugins/apt_keep_old_conffiles.py b/vmupdate/agent/source/plugins/apt_keep_old_conffiles.py