From 3c478ad1446513e697ee8b5ac23649fb0ccae27d Mon Sep 17 00:00:00 2001 From: Ark74 Date: Mon, 30 Mar 2026 02:12:40 -0600 Subject: [PATCH] ubuntu-release-upgrader: fix message on usrmerge error --- ...000-automatic_install_usrmerge_for_t-r-u.patch | 15 ++++++++------- helpers/make-ubuntu-release-upgrader | 2 +- 2 files changed, 9 insertions(+), 8 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 3c51b4ef..bac6017f 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 @@ -2,7 +2,7 @@ diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py index 9423f091..00d9b84c 100644 --- a/DistUpgrade/DistUpgradeQuirks.py +++ b/DistUpgrade/DistUpgradeQuirks.py -@@ -2000,17 +2000,27 @@ class DistUpgradeQuirks(object): +@@ -2000,17 +2000,28 @@ class DistUpgradeQuirks(object): break if fail: @@ -23,12 +23,13 @@ index 9423f091..00d9b84c 100644 + + if res2.returncode != 0: + # Installation failed, abort the upgrade with a clear message -+ self.controller._view.error(_( -+ "The system is not /usr-merged and 'usrmerge' could not be " -+ "installed automatically. Please install it manually and " -+ "try again." -+ )) -+ return ++ self.controller._view.error( ++ _("Cannot upgrade: System is not /usr-merged"), ++ _("The system is not /usr-merged and 'usrmerge' could not be " ++ "installed automatically. Please install it manually and " ++ "try again.") ++ ) ++ self.controller.abort() + + # Re-check that /usr merge is now in place + # (ensure /bin -> /usr/bin, /lib -> /usr/lib, etc.) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 1babbcaf..76a4199b 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=23 +VERSION=24 . ./config # Previous upstream release name, update for each release.