From 3be64a5310c060a299250fa48d190acae330ac2e Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Fri, 13 Mar 2026 13:33:51 -0400 Subject: [PATCH] Fix a bug in allow-ignore-software-db-update-failure.patch --- debian/changelog | 7 +++++++ .../allow-ignore-software-db-update-failure.patch | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5a25fb3..dad333e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares (3.3.14-0ubuntu22) resolute; urgency=medium + + * Fix a missing Python import in + 'allow-ignore-software-db-update-failure.patch'. + + -- Aaron Rainbolt Fri, 13 Mar 2026 13:32:41 -0400 + calamares (3.3.14-0ubuntu21) resolute; urgency=medium * Fix icon corruption on the "Users" page (LP: #2139358) diff --git a/debian/patches/allow-ignore-software-db-update-failure.patch b/debian/patches/allow-ignore-software-db-update-failure.patch index ac01077..8549c4b 100644 --- a/debian/patches/allow-ignore-software-db-update-failure.patch +++ b/debian/patches/allow-ignore-software-db-update-failure.patch @@ -1,5 +1,14 @@ --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py +@@ -19,7 +19,7 @@ from string import Template + import subprocess + + import libcalamares +-from libcalamares.utils import check_target_env_call, target_env_call ++from libcalamares.utils import check_target_env_call, target_env_call, target_env_process_output + from libcalamares.utils import gettext_path, gettext_languages + + import gettext @@ -252,7 +252,7 @@ class PMApk(PackageManager): check_target_env_call(["apk", "del", pkg])