From 0e28448af691a59bab756a03c10db37995e8add7 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Sat, 28 Mar 2026 10:51:43 -0600 Subject: [PATCH] ubuntu-release-upgrader: fix quirks report error view --- .../000-automatic_install_usrmerge_for_t-r-u.patch | 2 +- helpers/make-ubuntu-release-upgrader | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/DATA/ubuntu-release-upgrader/patch_changes/000-automatic_install_usrmerge_for_t-r-u.patch b/helpers/DATA/ubuntu-release-upgrader/patch_changes/000-automatic_install_usrmerge_for_t-r-u.patch index 9d2e828b..3c51b4ef 100644 --- a/helpers/DATA/ubuntu-release-upgrader/patch_changes/000-automatic_install_usrmerge_for_t-r-u.patch +++ b/helpers/DATA/ubuntu-release-upgrader/patch_changes/000-automatic_install_usrmerge_for_t-r-u.patch @@ -23,7 +23,7 @@ index 9423f091..00d9b84c 100644 + + if res2.returncode != 0: + # Installation failed, abort the upgrade with a clear message -+ self.controller.error(_( ++ self.controller._view.error(_( + "The system is not /usr-merged and 'usrmerge' could not be " + "installed automatically. Please install it manually and " + "try again." diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index d784d1d0..1babbcaf 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -25,7 +25,7 @@ # Also, don't forget to update the meta-release files at archive and packages.t.i # The "obsoletes" list from ubuntu has been removed -VERSION=22 +VERSION=23 . ./config # Previous upstream release name, update for each release.